2024-06-06提交

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/order/listener/BpmOrderRevokeSplitOrderResultListener.java

@@ -24,7 +24,9 @@ public class BpmOrderRevokeSplitOrderResultListener extends BpmProcessInstanceRe
 
     @Override
     protected void onEvent(BpmProcessInstanceResultEvent event) {
-        log.info("-------------------撤销拆单审核回调-------------------------{},{}", event.getBusinessKey(), event.getResult());
+        log.info("-------------------撤销拆单审核回调-------------------------{},{}",
+                event.getBusinessKey(), event.getResult());
+
         orderSplitService.revokeSplitApplyCallback(event.getBusinessKey(),
                 event.getResult());
     }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderMutualServiceImpl.java

@@ -40,7 +40,9 @@ import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class OrderMutualServiceImpl extends AbstractService<OrderMutualMapper, OrderMutualDO> implements OrderMutualService {
+public class OrderMutualServiceImpl extends AbstractService<OrderMutualMapper,
+        OrderMutualDO> implements OrderMutualService {
+
 
     @Resource
     private OrderMutualMapper mutualMapper;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -6104,6 +6104,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 // 删除子拆单的放货记录
                 orderCargoControlPickMapper.delete(new LambdaQueryWrapper<OrderCargoControlPickDO>().eq(OrderCargoControlPickDO::getOrderId, splitOrderId));
             }
+
             // 处理关联关系
             orderGuanlianService.dealGuanlianByOrderId(parentOrderId, orderIds, 2);
             // 处理互斥关系

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderSplit/OrderSplitServiceImpl.java

@@ -1562,7 +1562,7 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
             // 根据母订单id删除相关拆单信息
             splitItemMapper.deleteByOrderId(parentOrder.getOrderId());
             splitMapper.deleteByOrderId(parentOrder.getOrderId());
-            // 删除已撤销的拆单
+            // 删除已撤销的拆单 lanbm 2024-06-05 处理审批流BUG
             orderService.deleteOrderByParentOrderId(parentOrder.getOrderId(),
                     childrenOrderList);
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dto/LoadDto.java

 package cn.iocoder.yudao.module.shipment.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,55 +10,123 @@ import java.util.Date;
 @Data
 public class LoadDto {
 
+    /*
+     序号 0
+     */
     @ExcelProperty("id")
     private String id;
 
+    /*
+     订单号 1
+     */
     @ExcelProperty("orderNo")
     private String orderNo;
 
+    /*
+     唛头 2
+     */
     @ExcelProperty("marks")
     private String marks;
 
+    /*
+     获取描述 3
+     */
     @ExcelProperty("prodTitleZh")
     private String prodTitleZh;
 
+    /*
+     数量 4
+     */
+    @ExcelProperty("quantity")
+    private Integer quantity;
+
+    /*
+     品牌 5
+     */
     @ExcelProperty("brand")
     private String brand;
 
+    /*
+     备案 6
+     */
     @ExcelProperty("productRecord")
-    private String productRecord;
+    private String  productRecord;
 
+    /*
+     特性 7
+     */
+    @ExcelProperty("prodAttrIds")
+    private String prodAttrIds;
+
+    /*
+     总件数 8
+     */
     @ExcelProperty("sumNum")
     private Integer sumNum;
 
+    /*
+     单位 9
+     */
     @ExcelProperty("unit")
     private String unit;
 
+    /*
+     总体积 10
+     */
     @ExcelProperty("sumVolume")
     private BigDecimal sumVolume;
 
+    /*
+     总重量 11
+     */
     @ExcelProperty("sumWeight")
     private BigDecimal sumWeight;
 
+
+    /*
+     包装类型 12
+     */
     @ExcelProperty("packageType")
     private String packageType;
 
+    /*
+     材质 13
+     */
     @ExcelProperty("material")
     private String material;
 
+
+    /*
+     用途 14
+     */
+    @ExcelProperty("usageIds")
+    private String usageIds;
+
+
+    /*
+     合单 15
+     */
     @ExcelProperty("merge")
     private String merge;
 
+    /*
+     关联订单 16
+     */
     @ExcelProperty("relateOrder")
     private String relateOrder;
 
+
+    /*
+     报关方式 17
+     */
     @ExcelProperty("customsType")
     private String customsType;
 
+    /*
+     货值 18
+     */
     @ExcelProperty("worth")
     private BigDecimal worth;
 
-    @ExcelProperty("quantity")
-    private Integer quantity;
 
 }