2024-06-14-4提交发布

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderTimeMapper.xml

@@ -4,12 +4,12 @@
     <!--根据订单获取柜号 lanbm 2024-06-13 add-->
     <select id="getShipment_id" resultType="java.lang.Long">
         SELECT DISTINCT shipment_id from ecw_box_load_info
-        where order_id=#{orderId}
+        where order_id=#{orderId} limit 1
     </select>
     <!--根据柜号获取卸柜时间 lanbm 2024-06-13 add-->
     <select id="getUlboxtime" resultType="java.util.Date">
         select ul_box_time from ecw_box_cabinet_unload
-        where shipment_id=#{shipmentId}
+        where shipment_id=#{shipmentId} limit 1
     </select>
 
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java

@@ -419,18 +419,18 @@ public class ShipmentLoadExcelExportListener2 {
 
                                     //用途
                                     if (item.getUsageIds() == null || item.getUsageIds().length() == 0) {
-                                        preloadDto.setUsageIds("");
+                                        //preloadDto.setUsageIds("");
                                     } else {
                                         //在缓存数据字典中获取用途信息
                                         String sUserdName = DictFrameworkUtils.getDictDataFromCache(
                                                 "order_item_usage",
                                                 item.getUsageIds() + "").getLabel();
-                                        preloadDto.setUsageIds(sUserdName);
+                                        //preloadDto.setUsageIds(sUserdName);
                                     }
 
                                     //商品特性赋值 lanbm 2024-06-05 add
                                     String sR = getAttrName(item, ProductAttrMap);
-                                    preloadDto.setProdAttrIds(sR);
+                                    //preloadDto.setProdAttrIds(sR);
 
                                     preloadDto.setSumNum(item.getWarehouseInInfoVO().getCartonsNum());