执行单添加业务单元

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

@@ -230,6 +230,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
     @Transactional(rollbackFor = Exception.class)
     public Boolean executeAndIssue(List<Long> ids,Long organizationId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
+        String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
         try {
             for (Long id:ids){
                 BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);
@@ -283,6 +284,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                         executeOrder.setIssueName(loginUser.getWlhyLoginUser().getRealname());
                         executeOrder.setUpdateByName(loginUser.getWlhyLoginUser().getRealname());
                         executeOrder.setOrderStatus(1L);
+                        executeOrder.setBusinessUnit(orgName);
                         executeOrderMapper.updateById(executeOrder);
                         
                         //下发到tms
@@ -360,8 +362,6 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             tmsOrderAddDTO.setOrderSource("0");
                             tmsOrderAddDTO.setOrganizationId(organizationId);
                             tmsOrderAddDTO.setLoginUser(loginUser);
-                            String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
-
                             tmsOrderAddDTO.setOrganizationName(orgName);
 
                             AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java

@@ -140,5 +140,8 @@ public class ExecuteOrder extends BaseVOEntity{
     @ApiModelProperty("备注")
     private String  shippingNote;
 
+    @ApiModelProperty("业务单元")
+    private String businessUnit;
+
 
 }

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

@@ -119,6 +119,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
     @Transactional(rollbackFor = Exception.class)
     public Boolean issueDocuments(List<Long> ids,Long organizationId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
+        String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
         for (Long id:ids){
             ExecuteOrder  executeOrder=executeOrderMapper.selectById(id);
             if (ObjectUtil.isNotNull(executeOrder)){
@@ -128,6 +129,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                 executeOrder.setIssueName(loginUser.getWlhyLoginUser().getRealname());
                 executeOrder.setUpdateByName(loginUser.getWlhyLoginUser().getRealname());
                 executeOrder.setOrderStatus(1L);
+                executeOrder.setBusinessUnit(orgName);
                 executeOrderMapper.updateById(executeOrder);
                 //下发到tms
                 TmsOrderAddDTO tmsOrderAddDTO=new TmsOrderAddDTO();
@@ -205,7 +207,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setOrderSource("0");
                     tmsOrderAddDTO.setOrganizationId(organizationId);
                     tmsOrderAddDTO.setLoginUser(loginUser);
-                    String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
+
 
                     tmsOrderAddDTO.setOrganizationName(orgName);
 

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

@@ -197,6 +197,9 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String salesmanName;
 
+    @ApiModelProperty("业务单元")
+    private String businessUnit;
+
     @ApiModelProperty("业务单货物集合")
     private List<BusinessDocumentCargoMulti>  businessDocumentCargoMultiList;
 

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

@@ -141,4 +141,7 @@ public class ExecuteOrderDO extends BaseVOEntity{
 
     @ApiModelProperty("备注")
     private String  shippingNote;
+
+    @ApiModelProperty("业务单元")
+    private String businessUnit;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -134,4 +134,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("预计出发日期")
     private Date layDate;
+
+    @ApiModelProperty("业务单元")
+    private String businessUnit;
 }

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsNumber != null  and goodsNumber != ''">
             and GOODS_NUMBER like concat('%', #{goodsNumber}, '%')
         </if>
+            <if test="businessUnit != null  and businessUnit != ''">
+                and BUSINESS_UNIT like concat('%', #{businessUnit}, '%')
+            </if>
         <if test="orgName != null  and orgName != ''">
             and ORG_NAME like concat('%', #{orgName}, '%')
         </if>