aps-订单评审增加冗余字段，和赋值操作

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsBlankOrderDao.java

@@ -151,4 +151,6 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
     ApsBlankOrderDo countThisBatchNumber(@Param("batchNumber") String batchNumber, @Param("blankId") String blankId);
 
     String selectIsWaitGetMaterialById(@Param("id") String id);
+
+    String selectPlanEndProductionWorkshopsById(@Param("productionorderid") String productionorderid);
 }

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

@@ -2121,7 +2121,15 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         } else {
             this.save(apsBlankOrderDo);
         }
-
+        //根据坯料计划更新订单的 计划排产车间字段
+        String planEndProductionWorkshops = this.baseMapper.selectPlanEndProductionWorkshopsById(apsBlankOrderDo.getProductionorderid());
+        if (ObjectUtil.isNotEmpty(planEndProductionWorkshops)) {
+            HashSet<String> hashSet = new HashSet<>(Arrays.asList(planEndProductionWorkshops.split(",")));
+            ApsProductionOrderDo apsProductionOrderDo = new ApsProductionOrderDo();
+            apsProductionOrderDo.setId(apsBlankOrderDo.getId());
+            apsProductionOrderDo.setPlannedproductionworkshop(String.join(",", hashSet));
+            apsProductionOrderService.updateById(apsProductionOrderDo);
+        }
 
         for (ApsProcessOutputProductDo apsProcessOutputProductDo : apsProcessOutputProductDoList) {
             apsProcessOutputProductDo.setBlankid(apsBlankOrderDo.getId());

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

@@ -352,4 +352,15 @@
         where a.DELETED = 0
         AND a.ID = #{id}
     </select>
+    <select id="selectPlanEndProductionWorkshopsById" resultType="java.lang.String">
+        SELECT
+            GROUP_CONCAT( DISTINCT abo.PLANNEDPRODUCTIONWORKSHOP )
+        FROM
+            aps_production_order apo
+                LEFT JOIN aps_blank_order abo ON apo.ID = abo.PRODUCTIONORDERID
+                AND abo.DELETED = 0
+        WHERE
+            apo.DELETED = 0
+          AND apo.ID = #{productionorderid}
+    </select>
 </mapper>

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

@@ -629,6 +629,11 @@ public class ApsProductionOrderDo extends BaseDo implements Serializable {
      * 内部客户名称
      */
     private String internalcustomername;
+    /**
+     * 计划排产车间
+     */
+    @TableField("PLANNEDPRODUCTIONWORKSHOP")
+    private String plannedproductionworkshop;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -621,6 +621,21 @@ public class ApsProductionOrderHistoryDo extends BaseDo implements Serializable
      */
     private String processstatustext;
 
+    /**
+     * 内部客户ID
+     */
+    private String internalcustomerid;
+
+    /**
+     * 内部客户名称
+     */
+    private String internalcustomername;
+    /**
+     * 计划排产车间
+     */
+    @TableField("PLANNEDPRODUCTIONWORKSHOP")
+    private String plannedproductionworkshop;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }