谷丰维他奶oms流程修改

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

@@ -222,7 +222,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             String userAreaAddress = user.getUserAreaAddress();
                             subOrder.setUnloadAddress(userAreaAddress);
                             subOrder.setUnloadName(userAreaName);
-                            subOrder.setDischargerName(user.getUserName());
+                            subOrder.setDischargerName(businessDeliveryDetailsLinkDTO.getDeliveryName());
                             subOrder.setUnloadPhone(user.getUserPhone());
                             subOrder.setInvoiceNumber(businessDeliveryDetailsLinkDTO.getInvoiceNumber());
                             subOrder.setCustomerNumber(businessDeliveryDetailsLinkDTO.getCustomerNumber());
@@ -257,7 +257,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             unloadAddress.setAreaCode(userAreaAddress);
                             unloadAddress.setAreaName(userAreaName);
                             unloadAddress.setAddress(userAreaAddress);
-                            unloadAddress.setContactName(user.getUserName());
+                            unloadAddress.setContactName(businessDeliveryDetailsLinkDTO.getDeliveryName());
                             unloadAddress.setContactPhone(user.getUserPhone());
                             unloadAddress.setLayType(2L);
                             unloadAddress.setSort(1L);

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mhd.common.core.domain.po.UserShipperPo;
+import com.mhd.common.core.utils.DateUtils;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.oms.domain.businessDeliveryDetailsLink.entity.BusinessDeliveryDetailsLink;
@@ -339,6 +340,8 @@ public class BusinessDocumentOrderDomainService {
         } else {
             tmsOrder.setSplicingOrderType(0L); // 普通单
         }
+        //一小时候后
+        tmsOrder.setDocumentDate(DateUtils.addHours(new Date(), 1));
 
         boolean istrue = businessDocumentOrderMapper.insert(tmsOrder) > 0;
 

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -213,4 +213,12 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @ApiModelProperty("客户编号")
     @Excel(name = "客户编号")
     private String customerNumber;
+
+    @ApiModelProperty("主单业务单号")
+    @Excel(name = "主单业务单号")
+    private String mainOrderNumber;
+
+    @ApiModelProperty("卸货联系人")
+    @Excel(name = "卸货联系人")
+    private String dischargerName;
 }