diff --git a/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java b/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java index 2fdf828..65b11be 100644 --- a/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java +++ b/src/main/java/com/heai/modules/production/entity/DailyPlanInData.java @@ -63,6 +63,7 @@ public class DailyPlanInData implements Serializable { private Double weightFactor; private Double weight; private String soTaskNo; + private String remark; public String getTransFerNo() { return transFerNo; } @@ -350,4 +351,12 @@ public class DailyPlanInData implements Serializable { public void setTaskNo(String taskNo) { this.taskNo = taskNo; } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index c7e203e..1df3583 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -699,6 +699,11 @@ public class DailyPlanServiceImpl implements DailyPlanService { if(getSOScheduledRoutingOutData.size()==0){ throw new RuntimeException("该派工单不存在"); } + if(dailyPlanInData.getRemark()!=null&&"发料".equals(dailyPlanInData.getRemark())){ + if(getSOScheduledRoutingOutData.get(0).getCirculationSeqNo()!=null&&!"".equals(getSOScheduledRoutingOutData.get(0).getCirculationSeqNo())){ + throw new RuntimeException("该派工单已经流转不能发料"); + } + } List checkItemNoForIssue= dailyPlanMapper.checkItemNoForIssue(getSOScheduledRoutingOutData.get(0)); if(checkItemNoForIssue.size()>0){ throw new RuntimeException("只有第一道工序允许发料和退料"); diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 012a988..8401928 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -695,7 +695,7 @@ where a.site=#{site} and b.seqNo=#{seqNo} and a.Status='已录入' and a.NeedReceiveFlag='Y' and a.ToTypeFlag_DB='I'