Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -73,6 +73,7 @@ public class BusinessDocumentOrderApplicationService {
     private GwLogMapper gwLogMapper;
     @Autowired
     private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper;
+    @Resource
     private ExecuteOrderMapper executeOrderMapper;
 
     /**

mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/entity/BusinessDeliveryDetailsLink.java

@@ -1,5 +1,7 @@
 package com.mhd.oms.domain.businessDeliveryDetailsLink.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mhd.common.core.web.domain.BaseEntity;
@@ -20,6 +22,7 @@ import java.util.Date;
 @TableName("business_delivery_details_link")
 public class BusinessDeliveryDetailsLink extends BaseVOEntity {
     @ApiModelProperty(value = "主键")
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty(value = "创建时间")

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -274,8 +274,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             businessDeliveryDetailsLinkMapper.updateById(businessDeliveryDetailsLink);
 
                         }
-                        //配送进度：0/子单数量
-                        businessDocumentOrder.setDeliveryProgress("0/" + subOrderCount);
+                        businessDocumentOrder.setDeliveryProgress(String.valueOf(subOrderCount));
                     }
                 }else{
                     businessDocumentOrder.setOrderStatus(0L);

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -826,4 +826,7 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @ApiModelProperty("配送进度")
     private String deliveryProgress;
 
+    @ApiModelProperty("子单完成数量")
+    private Integer tmsOrderStatusCount;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -341,8 +341,7 @@ public class BusinessDocumentOrderDomainService {
         }
 
         boolean istrue = businessDocumentOrderMapper.insert(tmsOrder) > 0;
-        
-        // 如果有明细，为每个明细生成一个子单
+
         if (hasDetails) {
             for (BusinessDeliveryDetailsLinkDTO businessDeliveryDetailsLinkDTO : businessDeliveryDetailsLinkDTOList) {
 //                BusinessDocumentOrder subOrder = new BusinessDocumentOrder();
@@ -374,6 +373,7 @@ public class BusinessDocumentOrderDomainService {
                 BusinessDeliveryDetailsLink businessDeliveryDetailsLink = new BusinessDeliveryDetailsLink();
                 BeanUtils.copyProperties(businessDeliveryDetailsLinkDTO, businessDeliveryDetailsLink);
                 businessDeliveryDetailsLink.setOrderId(tmsOrder.getId());
+                businessDeliveryDetailsLink.setId(null);
 //                businessDeliveryDetailsLink.setSubOrderId(subOrder.getId());
                 businessDeliveryDetailsLinkMapper.insert(businessDeliveryDetailsLink);
             }