oms修改

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java

@@ -750,4 +750,10 @@ public class BusinessDocumentOrder extends BaseVOEntity{
 
     @ApiModelProperty("出入库单号")
     private String inOrderNumber;
+
+    @ApiModelProperty("仓库负责人")
+    private String directorName;
+
+    @ApiModelProperty("仓库负责人电话")
+    private String directorPhone;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java

@@ -784,6 +784,12 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
     @ApiModelProperty("出入库单号")
     private String inOrderNumber;
 
+    @ApiModelProperty("仓库负责人")
+    private String directorName;
+
+    @ApiModelProperty("仓库负责人电话")
+    private String directorPhone;
+
     @ApiModelProperty("费用科目明细")
     private List<BusinessOrderAccount> businessOrderAccountList;
 

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

@@ -426,7 +426,7 @@ public class BusinessDocumentOrderDomainService {
         tmsOrder.setCreaterPhone(u.getUserPo().getUserPhone());//保存创建人电话
         tmsOrder.setRealCreateBy(String.valueOf(u.getUserid()));
         tmsOrder.setRealCreateName(u.getWlhyLoginUser().getRealname());
-        tmsOrder.setAppointShipper(userShipperPo.getShipperEnterpriseName());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名
+        tmsOrder.setAppointShipper(businessDocumentOrderDO.getAppointShipper());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名
         String salesmanCodeNc = businessDocumentOrderDO.getSalesmanId();
         if (salesmanCodeNc != null){
             String makerCodeNc = businessDocumentOrderService.selectByMakerCodeNc(salesmanCodeNc);

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -203,6 +203,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setPayerType(0);
                     tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
                     tmsOrderAddDTO.setOrderSource("0");
+//                    tmsOrderAddDTO.setOrganizationId(organizationId);
 
                     AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                     if(ajaxResult.get("code").toString().equals("200")){

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java

@@ -87,7 +87,9 @@ public class ExecuteOrderDO extends BaseVOEntity{
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String organizationName;
-
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String orderStatus;
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long topOrganizationId;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java

@@ -846,9 +846,9 @@ public class ReservationStockOutOrderApplicationService {
             stockOutOrderDO.setShipperId(userPo.getUserId());
             stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
             stockOutOrderDO.setShipperName(userPo.getUserName());
-            stockOutOrderDO.setCustomerId(userPo.getUserId());
+//            stockOutOrderDO.setCustomerId(userPo.getUserId());
             stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
-            stockOutOrderDO.setCustomerName(userPo.getUserName());
+//            stockOutOrderDO.setCustomerName(userPo.getUserName());
         }
     }