aps-生产计划跟踪表新增字段需求

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

@@ -2874,6 +2874,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         Map<String, String> processLoadingMap = new HashMap<>();
         doSetMapLoading(processLoadingMap, lastProcessIdList, processOperationDoList);
 
+        //获取对应输出成品的产品明细
+        List<String> detailIdList = records.stream().map(ProductPlanReportVo::getOutputOrderDetailId).distinct().collect(Collectors.toList());
+        List<ApsProductDetailDo> apsProductDetailDoList = new ArrayList<>(apsProductDetailService.listByIds(detailIdList));
+
         for (ProductPlanReportVo record : records) {
             //加工车间
             if (ObjectUtil.isNotEmpty(blankIdAndWorkShopList)) {
@@ -2934,6 +2938,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             }
 
+            //分配客户订单号
+            ApsProductDetailDo apsProductDetailDo = apsProductDetailDoList.stream().filter(item -> item.getId().equals(record.getOutputOrderDetailId())).findFirst().orElse(null);
+            if (ObjectUtil.isNotEmpty(apsProductDetailDo) && ObjectUtil.isNotEmpty(apsProductDetailDo.getCustomorderno())) {
+                record.setCustomorderno(apsProductDetailDo.getCustomorderno());
+            }
+
         }
 
 

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -227,8 +227,8 @@
             abo.PROMISEDATESTART AS 'promiseDateStart',
             abo.PROMISEDATEEND AS 'promiseDateEnd',
             abo.BLANKNUMBER AS 'blankNumber',
-            apop.OUTPUTRESULT AS 'outPutResult',
-            CONCAT(abo.BLANKTYPE,IFNULL(abo.BLANKCOMEFROM,''),abo.INPUTREPORTDESCRIBE,' ',CAST(abo.SINGLEROLLWEIGHT AS CHAR) + 0,'吨*',abo.ROLLNUM,'卷') AS 'planBlank',
+            CONCAT(apop.OUTPUTRESULT,'=',CAST(apop.PLANOUTPUTONEROLLWEIGHT AS CHAR) + 0,'吨') AS 'outPutResult',
+            CONCAT(abo.BLANKTYPE,IFNULL(abo.BLANKCOMEFROM,''),abo.INPUTREPORTDESCRIBE,' ',CAST(abo.SINGLEROLLWEIGHT AS CHAR) + 0,'吨*',abo.ROLLNUM,'卷=',CAST(abo.SINGLEROLLWEIGHT*abo.ROLLNUM AS CHAR) + 0,'吨') AS 'planBlank',
             '' AS 'processWorkShop',
             null AS 'planChangeBlankDate',
             null AS 'actualChangeBlankDate',
@@ -242,7 +242,9 @@
             null AS 'actualStartDate',
             null AS 'actualEndDate',
             abo.REMARK AS 'blankRemark',
-            abo.ID AS 'blankId'
+            abo.ID AS 'blankId',
+            apop.ID AS 'processOutputId',
+            apop.PRODUCTID AS 'outputOrderDetailId'
             
         FROM
             aps_production_order apo

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProductPlanReportVo.java

@@ -69,4 +69,10 @@ public class ProductPlanReportVo extends ApsProductionOrderDo {
 
     //坯料计划ID
     private String blankId;
+
+    //输出成品ID
+    private String processOutputId;
+
+    //输出成品对应的产品明细ID
+    private String outputOrderDetailId;
 }