11

src/main/java/com/heai/modules/production/entity/SOScheduledRoutingOutData.java

@@ -31,6 +31,7 @@ public class SOScheduledRoutingOutData {
     private String workCenterDesc;
     private String partSpec;
     private String umid;
+    private String cancelReportFlag;
     /**
      *
      */
@@ -688,5 +689,13 @@ public class SOScheduledRoutingOutData {
     public void setUmid(String umid) {
         this.umid = umid;
     }
+
+    public String getCancelReportFlag() {
+        return cancelReportFlag;
+    }
+
+    public void setCancelReportFlag(String cancelReportFlag) {
+        this.cancelReportFlag = cancelReportFlag;
+    }
 }
 

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

@@ -885,7 +885,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         startSeqNoData.setSeqNo(inData.getSeqNo());
         startSeqNoData.setSite(inData.getSite());
         SOScheduledRoutingOutData result =dailyPlanMapper.searchSeqNo(inData);
-        if("Y".equals(result.getParkFlag())){
+        if("Y".equals(result.getCancelReportFlag())){
             return result;
         }else {
             List<SfdcTimeHistData> checkSfdcTimeHistData = dailyPlanMapper.checkSfdcTimeHistData(startSeqNoData);
@@ -906,6 +906,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         if(checkUserSeqNo.size()==0){
             throw new RuntimeException("该账号无权操作这个派工单！");
         }
+        if("Y".equals(checkUserSeqNo.get(0).getCancelReportFlag())){
+            throw new RuntimeException("该派工单被取消报工，请先补录报工！");
+        }
         inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo()));
         SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData);
         if(sfdcTimeHistData==null){
@@ -953,6 +956,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         if(checkUserSeqNo.size()==0){
             throw new RuntimeException("该账号无权操作这个派工单！");
         }
+        if("Y".equals(checkUserSeqNo.get(0).getCancelReportFlag())){
+            throw new RuntimeException("该派工单被取消报工，请先补录报工！");
+        }
         inData.setSite(dailyPlanMapper.getSeqNoSite(inData.getSeqNo()));
         SfdcTimeHistData sfdcTimeHistData=dailyPlanMapper.getsfdcTimeHistData(inData);
         if(sfdcTimeHistData==null){

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

@@ -339,21 +339,21 @@
         Insert into soscheduledrouting(Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,PlanStartTime,PlanFinishTime
                                   ,BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ShiftNo,S_WorkCenterNo
                                   ,SelectedFlag,SourceFlag,ParkFlag,TimeRequired_Original,QtyRequired_Original
-                                  ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1)
+                                  ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1,cancelReportFlag)
         values(#{site},#{orderNo},#{itemNo},#{seqNo},#{scheduleQty},0,0,dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderNo},#{itemNo},#{scheduleQty}),0,#{scheduleDate},#{scheduleDate}
             ,'*','',1,'N',0,'Y',#{scheduleDate},#{resourceId},#{shiftNo},#{workCenterNo}
             ,'N','N','N',dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderNo},#{itemNo},#{scheduleQty}),#{scheduleQty}
-            ,'N','N',#{efficiency},GETDATE(),'生产订单派工单',#{operatorId},#{partNo},#{orderNo})
+            ,'N','N',#{efficiency},GETDATE(),'生产订单派工单',#{operatorId},#{partNo},#{orderNo},'N')
     </insert>
       <insert id="saveScheduleForSOTask">
         Insert into soscheduledrouting(Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,PlanStartTime,PlanFinishTime
                                   ,BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ShiftNo,S_WorkCenterNo
                                   ,SelectedFlag,SourceFlag,ParkFlag,TimeRequired_Original,QtyRequired_Original
-                                  ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1)
+                                  ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,scheduleType,operatorId,partNo,OrderRef1,cancelReportFlag)
         values(#{site},#{orderRef1},#{itemNo},#{seqNo},#{scheduleQty},0,0,dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderRef1},#{itemNo},#{scheduleQty}),0,#{scheduleDate},#{scheduleDate}
             ,'*','',1,'N',0,'Y',#{scheduleDate},#{resourceId},#{shiftNo},#{workCenterNo}
             ,'N','N','N',dbo.Get_SOScheduleRouting_TimeRequired(#{site},#{orderRef1},#{itemNo},#{scheduleQty}),#{scheduleQty}
-            ,'N','N',#{efficiency},GETDATE(),'日计划派工单',#{operatorId},#{partNo},#{orderNo})
+            ,'N','N',#{efficiency},GETDATE(),'日计划派工单',#{operatorId},#{partNo},#{orderNo},'N')
     </insert>
 
     <update id="updateScheduleListQty">
@@ -432,7 +432,7 @@
         order by S_ScheduledDate
     </select>
     <select id="checkUserSeqNo" resultType="SOScheduledRoutingOutData">
-        select seqNo  from SOScheduledRouting a
+        select seqNo ,CancelReportFlag from SOScheduledRouting a
           left join user_work_center uwc on a.site=uwc.site and a.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}
           where seqNo=#{seqNo} and uwc.WorkCenterNo is not null
     </select>
@@ -479,7 +479,7 @@
         BarcodeID,Remark,Crewsize,ClosedFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo,
         S_WorkCenterNo, EnteredDate,scheduleType,operatorId,partNo,dbo.Get_PartDesc(Site,partNo) as partDesc,
         dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,orderNo,ItemNo) as itemDesc,orderRef1 ,
-        dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,closedFlag,outWorkFlag,ParkFlag
+        dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,closedFlag,outWorkFlag,ParkFlag,CancelReportFlag
         from SOScheduledRouting
         where site=#{site} and SeqNo=#{seqNo}
     </select>