|
@@ -840,7 +840,7 @@ public class BizDayworkController extends BaseController {
|
|
//查询出该生产计划的当前生产批数
|
|
//查询出该生产计划的当前生产批数
|
|
Integer getdayworkNum = bizDayworkService.getdayworkNum(bizDaywork.getProductionPlanDetailId());
|
|
Integer getdayworkNum = bizDayworkService.getdayworkNum(bizDaywork.getProductionPlanDetailId());
|
|
Integer num = (getdayworkNum != null) ? getdayworkNum.intValue() : 0; // 如果 dayworkNum 为 null,则赋值为默认值 0
|
|
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();
|
|
List<BizDaywork> lotId = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).list();
|
|
if (!lotId.isEmpty()) {
|
|
if (!lotId.isEmpty()) {
|