aps-坯料计划增加字段：成品规格、成品合金、成品合金状态

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

@@ -2538,7 +2538,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 borrowBlank(progressWork);
             }
         }
-        //工艺描述
+        //工艺描述、成品规格、成品合金、成品合金状态
         setProcessDesc(apsProductionOrderDo, apsBlankOrderDo, apsProcessOutputProductDoList, collator, checkLevel);
 
         return R.ok();
@@ -2548,6 +2548,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //输出成品拼接字段：输出工艺描述
         List<ApsProcessOutputProductDo> needUpdateOutputList = new LinkedList<>();
         boolean idmatureprocess = true;//是否成熟工艺
+        //成品规格
+        List<String> endproductsizeList = new LinkedList<>();
+        //成品合金
+        List<String> endproductalloyList = new LinkedList<>();
+        //成品合金状态
+        List<String> endproductalloystatusList = new LinkedList<>();
         for (ApsProcessOutputProductDo apsProcessOutputProductDo : apsProcessOutputProductDoList) {
             //合金、合金状态、产品类型及其替代
             String alloy = StringUtils.isNotBlank(apsProcessOutputProductDo.getAlloy()) ? apsProcessOutputProductDo.getAlloy() : "";
@@ -2598,6 +2604,17 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if (StringUtils.isEmpty(apsProcessOutputProductDo.getIdmatureprocess()) || apsProcessOutputProductDo.getIdmatureprocess().equals("否")) {
                 idmatureprocess = false;
             }
+
+            //成品规格
+            String endproductsize = thickness + "*" + prowidth;
+            if (StringUtils.isNotBlank(prolength)) {
+                endproductsize += "*" + prolength;
+            }
+            endproductsizeList.add(endproductsize);
+            //成品合金
+            endproductalloyList.add(alloy);
+            //成品合金状态
+            endproductalloystatusList.add(alloystatus);
         }
         //坯料计划拼接字段：工艺描述
         List<String> outputProcessDescList = needUpdateOutputList.stream().map(ApsProcessOutputProductDo::getOutputprocessdes).collect(Collectors.toList());
@@ -2634,6 +2651,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         needUpdate.setId(apsBlankOrderDo.getId());
         needUpdate.setProcessdesc(endProcessDesc);
 
+        //成品规格
+        String endproductsize = String.join("/", endproductsizeList.stream().distinct().collect(Collectors.toList()));
+        //成品合金
+        String endproductalloy = String.join("/", endproductalloyList.stream().distinct().collect(Collectors.toList()));
+        //成品合金状态
+        String endproductalloystatus = String.join("/", endproductalloystatusList.stream().distinct().collect(Collectors.toList()));
+        needUpdate.setEndproductsize(endproductsize);
+        needUpdate.setEndproductalloy(endproductalloy);
+        needUpdate.setEndproductalloystatus(endproductalloystatus);
+
         //更新输出成品和坯料计划
         apsProcessOutputProductService.updateBatchById(needUpdateOutputList);
         apsBlankOrderService.updateById(needUpdate);
@@ -5521,7 +5548,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
                 //输出成品拼接字段：输出工艺描述
                 List<ApsProcessOutputProductDo> needUpdateOutputList = new LinkedList<>();
-                boolean idmatureprocess = true;//是否成熟工艺
+                //成品规格
+                List<String> endproductsizeList = new LinkedList<>();
+                //成品合金
+                List<String> endproductalloyList = new LinkedList<>();
+                //成品合金状态
+                List<String> endproductalloystatusList = new LinkedList<>();
                 for (ApsProcessOutputProductDo apsProcessOutputProductDo : value) {
                     //合金、合金状态、产品类型及其替代
                     String alloy = StringUtils.isNotBlank(apsProcessOutputProductDo.getAlloy()) ? apsProcessOutputProductDo.getAlloy() : "";
@@ -5569,9 +5601,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     needUpdate.setOutputprocessdes(outputprocessdes);
                     needUpdateOutputList.add(needUpdate);
 
-                    if (StringUtils.isEmpty(apsProcessOutputProductDo.getIdmatureprocess()) || apsProcessOutputProductDo.getIdmatureprocess().equals("否")) {
-                        idmatureprocess = false;
+                    //成品规格
+                    String endproductsize = thickness + "*" + prowidth;
+                    if (StringUtils.isNotBlank(prolength)) {
+                        endproductsize += "*" + prolength;
                     }
+                    endproductsizeList.add(endproductsize);
+                    //成品合金
+                    endproductalloyList.add(alloy);
+                    //成品合金状态
+                    endproductalloystatusList.add(alloystatus);
                 }
                 //坯料计划拼接字段：工艺描述
                 List<String> outputProcessDescList = needUpdateOutputList.stream().map(ApsProcessOutputProductDo::getOutputprocessdes).collect(Collectors.toList());
@@ -5608,6 +5647,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 needUpdate.setId(apsBlankOrderDo.getId());
                 needUpdate.setProcessdesc(endProcessDesc);
 
+                //成品规格
+                String endproductsize = String.join("/", endproductsizeList.stream().distinct().collect(Collectors.toList()));
+                //成品合金
+                String endproductalloy = String.join("/", endproductalloyList.stream().distinct().collect(Collectors.toList()));
+                //成品合金状态
+                String endproductalloystatus = String.join("/", endproductalloystatusList.stream().distinct().collect(Collectors.toList()));
+                needUpdate.setEndproductsize(endproductsize);
+                needUpdate.setEndproductalloy(endproductalloy);
+                needUpdate.setEndproductalloystatus(endproductalloystatus);
+
                 neeUpdateAll.addAll(needUpdateOutputList);
                 neeUpdateAll2.add(needUpdate);
             } catch (Exception e) {

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

@@ -439,7 +439,7 @@
     </update>
     <update id="updateBlankBatchById">
         <foreach collection="list" item="item">
-            update aps_blank_order set PROCESSDESC = #{item.processdesc} where ID = #{item.id};
+            update aps_blank_order set PROCESSDESC = #{item.processdesc},ENDPRODUCTSIZE=#{item.endproductsize},ENDPRODUCTALLOY=#{item.endproductalloy},ENDPRODUCTALLOYSTATUS=#{item.endproductalloystatus} where ID = #{item.id};
         </foreach>
     </update>
     <select id="checkConflictByBlankId" resultType="java.lang.Integer">

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

@@ -347,5 +347,20 @@ public class ApsBlankOrderDo extends BaseDo {
      */
     @TableField("PROCESSDESC")
     private String processdesc;
+    /**
+     * 成品规格
+     */
+    @TableField("ENDPRODUCTSIZE")
+    private String endproductsize;
+    /**
+     * 成品合金
+     */
+    @TableField("ENDPRODUCTALLOY")
+    private String endproductalloy;
+    /**
+     * 成品合金状态
+     */
+    @TableField("ENDPRODUCTALLOYSTATUS")
+    private String endproductalloystatus;
 
 }

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

@@ -294,4 +294,19 @@ public class ApsBlankOrderHistoryDo extends BaseDo {
      */
     @TableField("PROCESSDESC")
     private String processdesc;
+    /**
+     * 成品规格
+     */
+    @TableField("ENDPRODUCTSIZE")
+    private String endproductsize;
+    /**
+     * 成品合金
+     */
+    @TableField("ENDPRODUCTALLOY")
+    private String endproductalloy;
+    /**
+     * 成品合金状态
+     */
+    @TableField("ENDPRODUCTALLOYSTATUS")
+    private String endproductalloystatus;
 }