guoyujia 9 mēneši atpakaļ
vecāks
revīzija
20f890c5d1

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

@@ -840,7 +840,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) || bizDaywork.getFromId() != 0) {
+            if (num < lotNumber || (bizDaywork.getIsWasteRecycling() == null ? false : bizDaywork.getIsWasteRecycling() == 1) || bizDaywork.getFromId() != 0 || bizDaywork.getIsSuperaddition() == 1) {
                 //查询该批次号是否已经被领取
                 List<BizDaywork> lotId = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).list();
                 if (!lotId.isEmpty()) {

+ 2 - 0
src/main/java/cn/ezhizao/project/business/product/domain/BizDaywork.java

@@ -221,4 +221,6 @@ public class BizDaywork extends BaseEntity
     private List<BizInspectionChamber> inspectionChambers;
     @TableField(exist = false)
     private Integer prodNum;
+    @TableField(exist = false)
+    private Integer isSuperaddition;
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/business/product/domain/BizLot.java

@@ -156,5 +156,6 @@ public class BizLot extends BaseEntity
     private String processStepNumber;
     @TableField(exist = false)
     private List<BizInspectionChamber> inspectionChamberList;
+    private Integer isSuperaddition;
 
 }