aps-坯料计划增加字段，客户简称

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2404,6 +2404,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             blankUpdateWrapper.set(ApsBlankOrderDo::getCustomorderno, apsBlankOrderDo.getCustomorderno());
             blankUpdateWrapper.set(ApsBlankOrderDo::getCustomname, apsBlankOrderDo.getCustomname());
             blankUpdateWrapper.set(ApsBlankOrderDo::getCardid, apsBlankOrderDo.getCardid());
+            blankUpdateWrapper.set(ApsBlankOrderDo::getCustomeasyname, apsBlankOrderDo.getCustomeasyname());
 
             this.update(blankUpdateWrapper);
         } else {

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -167,6 +167,8 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private WorkFlowServiceImpl workFlowService;
     @Autowired
     private SysGeneralCRUDService sysGeneralCRUDService;
+    @Autowired
+    private ApsCustomerManagementService apsCustomerManagementService;
 
 
     public static final String ERROR_MSG = "%s上诉订单的排程交货期大于承诺交货期";
@@ -1215,6 +1217,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         String orderno = StringUtils.isNotBlank(orderDo.getOrderno()) ? orderDo.getOrderno() : "";
         String customorderno = StringUtils.isNotBlank(orderDo.getCustomorderno()) ? orderDo.getCustomorderno() : "";
         String customname = StringUtils.isNotBlank(orderDo.getCustomname()) ? orderDo.getCustomname() : "";
+        String customId = StringUtils.isNotBlank(orderDo.getCustomid()) ? orderDo.getCustomid() : "";
         List<String> blankIdList = apsBlankOrderDoList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
         if (!blankIdList.isEmpty()) {
             List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = apsProcessOutputProductService.list(new LambdaQueryWrapper<ApsProcessOutputProductDo>().in(ApsProcessOutputProductDo::getBlankid, blankIdList));
@@ -1243,13 +1246,18 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                         } else {
                             needUpdateOutProduct.setOrderno(apsProductionMergeOrderDo.getOrderno());
                             needUpdateOutProduct.setCustomname(apsProductionMergeOrderDo.getCustomname());
+                            customId = apsProductionMergeOrderDo.getCustomid();
                         }
                     } else {
                         needUpdateOutProduct.setCustomorderno(customorderno);
                         needUpdateOutProduct.setOrderno(orderno);
                         needUpdateOutProduct.setCustomname(customname);
                     }
-
+                }
+                //客户ID不为空，查询客户简称赋值
+                if (StringUtils.isNotBlank(customId)) {
+                    ApsCustomerManagementDo apsCustomerManagementDo = apsCustomerManagementService.getById(customId);
+                    needUpdateOutProduct.setCustomeasyname(apsCustomerManagementDo.getCustomerabbreviation());
                 }
                 needUpdateOutProductList.add(needUpdateOutProduct);
             }
@@ -1261,11 +1269,13 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 String orderNos = apsProcessOutputProductDos.stream().map(ApsProcessOutputProductDo::getOrderno).distinct().collect(Collectors.joining(","));
                 String customOrderNos = apsProcessOutputProductDos.stream().map(ApsProcessOutputProductDo::getCustomorderno).distinct().collect(Collectors.joining(","));
                 String customNames = apsProcessOutputProductDos.stream().map(ApsProcessOutputProductDo::getCustomname).distinct().collect(Collectors.joining(","));
+                String customEasyNames = apsProcessOutputProductDos.stream().map(ApsProcessOutputProductDo::getCustomeasyname).distinct().collect(Collectors.joining(","));
                 ApsBlankOrderDo needUpdateBlank = new ApsBlankOrderDo();
                 needUpdateBlank.setId(key);
                 needUpdateBlank.setOrderno(orderNos);
                 needUpdateBlank.setCustomorderno(customOrderNos);
                 needUpdateBlank.setCustomname(customNames);
+                needUpdateBlank.setCustomeasyname(customEasyNames);
                 needUpdateBlankList.add(needUpdateBlank);
             }
             //更新输出成品集合和坯料计划集合

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderDo.java

@@ -332,5 +332,10 @@ public class ApsBlankOrderDo extends BaseDo {
      */
     @TableField("CARDID")
     private String cardid;
+    /**
+     * 客户简称
+     */
+    @TableField("CUSTOMEASYNAME")
+    private String customeasyname;
 
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderHistoryDo.java

@@ -279,4 +279,9 @@ public class ApsBlankOrderHistoryDo extends BaseDo {
      */
     @TableField("CARDID")
     private String cardid;
+    /**
+     * 客户简称
+     */
+    @TableField("CUSTOMEASYNAME")
+    private String customeasyname;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOutputProductDo.java

@@ -426,6 +426,10 @@ public class ApsProcessOutputProductDo extends BaseDo {
      * 客户名称
      */
     private String customname;
+    /**
+     * 客户简称
+     */
+    private String customeasyname;
 
     private static final long serialVersionUID = 1L;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOutputProductHistoryDo.java

@@ -408,6 +408,10 @@ public class ApsProcessOutputProductHistoryDo extends BaseDo {
      * 客户名称
      */
     private String customname;
+    /**
+     * 客户简称
+     */
+    private String customeasyname;
 
     private static final long serialVersionUID = 1L;
 }