0430

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -732,7 +732,7 @@ public class BizDayworkController extends BaseController {
             //查询出该生产计划的当前生产批数
             Integer getdayworkNum = bizDayworkService.getdayworkNum(bizDaywork.getProductionPlanDetailId());
             Integer num = (getdayworkNum != null) ? getdayworkNum.intValue() : 0; // 如果 dayworkNum 为 null，则赋值为默认值 0
-            if (num < lotNumber || (bizDaywork.getIsWasteRecycling()==null? false : bizDaywork.getIsWasteRecycling() == 1)) {
+            if (num < lotNumber || (bizDaywork.getIsWasteRecycling()==null? false : bizDaywork.getIsWasteRecycling() == 1) || bizDaywork.getFromId()!=0) {
                 //查询该批次号是否已经被领取
                 List<BizDaywork> lotId = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).list();
                 if (lotId.size() > 0) {

src/main/java/cn/ezhizao/project/business/product/domain/BizDaywork.java

@@ -184,4 +184,6 @@ public class BizDaywork extends BaseEntity
 
     @TableField(exist = false)
     private Integer isWaste;
+    @TableField(exist = false)
+    private Long fromId;
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizLot.java

@@ -122,6 +122,7 @@ public class BizLot extends BaseEntity
     private String requisitionDepartmentName;
     @TableField(exist = false)
     private String flag;
+    private Long fromId;