0412更新

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;
+    }
 }

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<SORoutingData> checkItemNoForIssue= dailyPlanMapper.checkItemNoForIssue(getSOScheduledRoutingOutData.get(0));
         if(checkItemNoForIssue.size()>0){
             throw new RuntimeException("只有第一道工序允许发料和退料");

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'
     </select>
     <select id="getSOScheduledRoutingOutData" resultType="SOScheduledRoutingOutData">
-        select Site,OrderNo,seqNo,itemNo,S_ShiftNo,scheduleType,operatorId from SOScheduledRouting where seqNo=#{seqNo}
+        select Site,OrderNo,seqNo,itemNo,S_ShiftNo,scheduleType,operatorId,circulation_seqNo from SOScheduledRouting where seqNo=#{seqNo}
     </select>
 
  <select id="checkItemNoForIssue" resultType="SORoutingData">

src/main/resources/static/js/pda/productionIssue.js

@@ -42,6 +42,7 @@ function getOrderNoData(){
 	let jsonData = {
 
 		seqNo : orderNoSearch,
+		remark:'发料',
 	}
 	$.ajax({
         url: "/pdaOrder/getShopOrder",