0412更新

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1135,9 +1135,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         if(checkFirstItem.size()==0&&"N".equals(checkUserSeqNo.get(0).getMatIssueflag())){
             throw new RuntimeException("派工单是首道工序且没有发料！请先发料！");
         }
-        //----------检查下是否第一道工序 是否发料-----------------end
+        //----------检查是否第一道工序 是否发料-----------------end
 
-        //----------检查下前道工序是否报工-----------------
+        //----------检查前道工序是否报工-----------------
         if(checkFirstItem.size()>0) {
             List<SORoutingData> checkLast = dailyPlanMapper.checkLastItemReport(checkUserSeqNo.get(0));
             if(checkLast.size()>0){
@@ -1160,6 +1160,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
                     if(!sfdcCheck.get(0).getOrderNo().equals(checkFirstItem.get(0).getOrderNo())||sfdcCheck.get(0).getItemNo().intValue()!=checkFirstItem.get(0).getItemNo().intValue()){
                         throw new RuntimeException("扫描的上道派工单不匹配！");
                     }
+                    if(getPreviousSOSData.get(0).getMaterSeqNo()==null){
+                        throw new RuntimeException("上道派工单没有交接记录！");
+                    }
                     dailyPlanMapper.updatePreviousSOSData(inData.getSeqNo(),inData.getPreviousSeqNo(),getPreviousSOSData.get(0).getPreviousBatchNo(),getPreviousSOSData.get(0).getMaterSeqNo());
                 }
             }

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -651,7 +651,7 @@
         BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo,
         S_WorkCenterNo,ParkFlag,TimeRequired_Original,QtyRequired_Original,QtyReturntoSchedule,StartProdFlag,CancelledProdFlag,
         Efficiency,EnteredDate,SelectedFlag,SourceFlag,Closedby,ClosedDate,VirtualResourceFlag,mat_issueflag,plate_issueflag,
-        tool_issueflag,scheduleType,operatorId,partNo,orderRef1,circulation_seqNo,circulation_qty,jobType from SOScheduledRouting where
+        tool_issueflag,scheduleType,operatorId,partNo,orderRef1,circulation_seqNo,circulation_qty,PreviousSeqNo,PreviousBatchNo,materSeqNo,jobType from SOScheduledRouting where
         site=#{site} and seqNo=#{seqNo}
     </select>
 
@@ -665,12 +665,12 @@
         BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo,
         S_WorkCenterNo,ParkFlag,TimeRequired_Original,QtyRequired_Original,QtyReturntoSchedule,StartProdFlag,CancelledProdFlag,
         Efficiency,EnteredDate,SelectedFlag,SourceFlag,Closedby,ClosedDate,VirtualResourceFlag,mat_issueflag,plate_issueflag,
-        tool_issueflag,scheduleType,operatorId,partNo,orderRef1,jobType) values
+        tool_issueflag,scheduleType,operatorId,partNo,orderRef1,jobType,PreviousSeqNo,PreviousBatchNo,materSeqNo) values
         (#{site},#{orderNo},#{itemNo},#{seqNo},#{qtyRequired},0,0,0,0,#{planStartTime},#{planFinishTime},
         #{barcodeID},#{remark},#{crewsize},'N',0,'Y',#{sScheduledDate},#{sResourceID},#{sScheduledSeqNo},#{sShiftNo},
         #{sWorkCenterNo},#{parkFlag},#{timeRequiredOriginal},#{qtyRequiredOriginal},null,'N','N',
         0,GetDate(),'N','N',NULL,NULL,NULL,#{matIssueflag},'N','N',#{scheduleType},#{operatorId},#{partNo},#{orderRef1},#{jobType}
-        )
+        ,#{previousSeqNo},#{previousBatchNo},#{materSeqNo})
     </insert>
 
     <update id="closeSchedule">
@@ -1025,7 +1025,7 @@
     </update>
 
     <select id="getPreviousSOSData" resultType="SOScheduledRoutingOutData">
-        select PreviousSeqNo,PreviousBatchNo,materSeqNo from SOScheduledRouting where seqNo=#{previousSeqNo,jdbcType=INTEGER}
+        select seqNo,PreviousSeqNo,PreviousBatchNo,materSeqNo from SOScheduledRouting where seqNo=#{previousSeqNo,jdbcType=INTEGER}
     </select>
 
     <update id="updatePreviousSOSData">