aps-备料借调修改

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

@@ -2256,7 +2256,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
             progressWork = apsWorkInProgressInventoryDos.get(0);
             if (ObjectUtil.isNotEmpty(progressWork.getPlanmaterialid()) && !progressWork.getPlanmaterialid().equals(apsBlankOrderDo.getId())) {
-                return R.error("所选在制品已被其他备料计划使用");
+                ApsBlankOrderDo apsMaterBlankOrderDo = apsBlankOrderService.getById(progressWork.getPlanmaterialid());
+                String materBlankNumber = "";
+                if (apsMaterBlankOrderDo != null) {
+                    materBlankNumber = apsMaterBlankOrderDo.getBlanknumber();
+                }
+                return R.error("所选在制品已被其他备料计划" + materBlankNumber + "使用");
             }
         }
 
@@ -2485,16 +2490,18 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 //            apsWorkInProgressInventoryDo.setPlanmaterialid(apsBlankOrderDo.getId());
 //            apsWorkInProgressInventoryDo.setWorkinprocessstatus(SaveConstans.WorkInProgressStatus.WAIT_WORK);
 //            apsWorkInProgressInventoryService.updateById(apsWorkInProgressInventoryDo);
-            String progressId = progressWork.getId();
-            apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
-                    .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, apsBlankOrderDo.getId())
-                    .setSql("PREVIOUSWORKINPROCESSSTATUS = WORKINPROCESSSTATUS")
-                    .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, SaveConstans.WorkInProgressStatus.WAIT_WORK)
-                    .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
-                    .eq(ApsWorkInProgressInventoryDo::getId, progressId));
+            if (ObjectUtil.isEmpty(progressWork.getPlanmaterialid())) {
+                String progressId = progressWork.getId();
+                apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
+                        .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, apsBlankOrderDo.getId())
+                        .setSql("PREVIOUSWORKINPROCESSSTATUS = WORKINPROCESSSTATUS")
+                        .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, SaveConstans.WorkInProgressStatus.WAIT_WORK)
+                        .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
+                        .eq(ApsWorkInProgressInventoryDo::getId, progressId));
 
-            //借调逻辑
-            borrowBlank(progressWork);
+                //借调逻辑
+                borrowBlank(progressWork);
+            }
         }
 
         return R.ok();