Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -149,4 +149,8 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
 
     @Select("select * from aps_blank_order where DELETED = 0 AND FIND_IN_SET(#{batchNumber},PREPAREMATERIALBATCHNO) AND ID != #{blankId} limit 1")
     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

@@ -261,7 +261,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .set(ApsBlankOrderDo::getProductstatus, producttStatus)
                     .set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
             //存储日志
-            apsConflictLogService.recordLog("","更新坯料计划状态为待排程，坯料计划ID为："+blankId,"",1,null);
+            apsConflictLogService.recordLog("", "更新坯料计划状态为待排程，坯料计划ID为：" + blankId, "", 1, null);
         });
 //        // 更新产品明细的生产状态
 //        apsProductDetailDao.publishCancel(blankIds);
@@ -775,7 +775,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     apsProcessOperationProcessEqu.setNextprocessesids(CollUtil.join(process.getNextProcessesIds(), ","));
                     apsProcessOperationProcessEqu.setLockmark("y");
                     apsProcessOperationProcessEqu.setLockmarkdetail("y");
-                    if(process.getOptionalEquipmentZg() != null && process.getOptionalEquipmentZg().size()>0){
+                    if (process.getOptionalEquipmentZg() != null && process.getOptionalEquipmentZg().size() > 0) {
                         apsProcessOperationProcessEqu.setRollerid(process.getOptionalEquipmentZg().get(process.getEquipment().getId()));
                     }
                     if (hasEqu != null) {
@@ -1702,13 +1702,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .set(ApsProcessOperationDo::getLockmark, LOCKMARK_N)
         );
         //存储日志
-        apsConflictLogService.recordLog("","更新工序作业的生产状态为待排程，坯料计划ID为："+blankids,"",2,null);
+        apsConflictLogService.recordLog("", "更新工序作业的生产状态为待排程，坯料计划ID为：" + blankids, "", 2, null);
 
         // 清空作业明细
         processOperationProcessEquService.remove(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                 .in(ApsProcessOperationProcessEquDo::getBlankid, blankids));
         //存储日志
-        apsConflictLogService.recordLog("","逻辑删除作业明细，坯料计划ID为："+blankids,"",2,null);
+        apsConflictLogService.recordLog("", "逻辑删除作业明细，坯料计划ID为：" + blankids, "", 2, null);
 
         // 更新生产订单的状态
         apsProductionOrderService.update(new LambdaUpdateWrapper<ApsProductionOrderDo>()
@@ -1718,7 +1718,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         // 更新坯料计划的状态
         this.baseMapper.cancelSchedulingUpdate(blankids);
         //存储日志
-        apsConflictLogService.recordLog("","更新坯料计划状态为待排程，坯料计划ID为："+blankids,"",1,null);
+        apsConflictLogService.recordLog("", "更新坯料计划状态为待排程，坯料计划ID为：" + blankids, "", 1, null);
         //获取坯料计划用到的产品明细ID
         String idStrs = CollUtil.join(blankids, "','");
         idStrs = "'" + idStrs + "'";
@@ -2038,6 +2038,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if (!(r.getCode().equals("200"))) {
                 return R.error(r.getMsg());
             }
+            //赋值坯料计划冗余字段 是否待领料
+            String isWaitGetMaterial = this.baseMapper.selectIsWaitGetMaterialById(apsBlankOrderDo.getId());
+            apsBlankOrderDo.setIswaitgetmaterial(isWaitGetMaterial);
         }
 
         //更新或保存坯料计划和输出成品
@@ -2112,12 +2115,21 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             blankUpdateWrapper.set(ApsBlankOrderDo::getUpdateprocess, apsBlankOrderDo.getUpdateprocess());
             blankUpdateWrapper.set(ApsBlankOrderDo::getExpecteddays, apsBlankOrderDo.getExpecteddays());
             blankUpdateWrapper.set(ApsBlankOrderDo::getIssubmitprocessroute, apsBlankOrderDo.getIssubmitprocessroute());
+            blankUpdateWrapper.set(ApsBlankOrderDo::getIswaitgetmaterial, apsBlankOrderDo.getIswaitgetmaterial());
 
             this.update(blankUpdateWrapper);
         } 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());
@@ -2630,7 +2642,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //逻辑删除坯料计划工序作业-作业明细
         apsProcessOperationProcessEquService.remove(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getBlankid, req.getId()));
         //存储日志
-        apsConflictLogService.recordLog("","逻辑删除作业明细，坯料计划ID为："+req.getId(),"",2,null);
+        apsConflictLogService.recordLog("", "逻辑删除作业明细，坯料计划ID为：" + req.getId(), "", 2, null);
 
         //逻辑删除坯料计划的工艺路线
         this.baseMapper.removeMindMappingByBlankId(req.getId());
@@ -3464,7 +3476,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             ApsBlankOrderDo updateBlank = new ApsBlankOrderDo();
             updateBlank.setId(apsBlankOrderDo.getId());
             updateBlank.setPreparematerialbatchno(String.join(",", preparematerialbatchnoList));
-            this.updateById(updateBlank);
+
 
             /**
              * 检验通过，
@@ -3542,6 +3554,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));
             }
+            //赋值坯料计划冗余字段 是否待领料
+            String isWaitGetMaterial = this.baseMapper.selectIsWaitGetMaterialById(apsBlankOrderDo.getId());
+            apsBlankOrderDo.setIswaitgetmaterial(isWaitGetMaterial);
+            this.updateById(updateBlank);
         } finally {
             log.debug("领料完毕，从list中清空当前领料锁，批次号：" + inputNumberList);
             addMaterialLock.removeAll(inputNumberList);

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

@@ -307,5 +307,10 @@ public class ApsBlankOrderDo extends BaseDo {
      */
     @TableField("ISSUBMITPROCESSROUTE")
     private String issubmitprocessroute;
+    /**
+     * 是否待领料
+     */
+    @TableField("ISWAITGETMATERIAL")
+    private String iswaitgetmaterial;
 
 }

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

@@ -254,4 +254,9 @@ public class ApsBlankOrderHistoryDo extends BaseDo {
      */
     @TableField("ISSUBMITPROCESSROUTE")
     private String issubmitprocessroute;
+    /**
+     * 是否待领料
+     */
+    @TableField("ISWAITGETMATERIAL")
+    private String iswaitgetmaterial;
 }

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;
 }