0404 BUG 修改

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -260,7 +260,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //查询数据
         List<Map<String, Object>> resultList = scheduleMapper.countSfdcTimeQty(inData);
         //判断是否查询到结果数据
-        if (resultList.size() > 0 && resultList.isEmpty() ) {
+        if (resultList.size() > 0 && resultList.get(0) != null) {
             result = resultList.get(0);
             //处理时间的数据
             //处理调机
@@ -2156,6 +2156,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         Float sfdcManufactureTime = pageData.getSfdcManufactureTime();//制造时间
         String exceptionFlag = pageData.getExceptionFlag();
         String exceptionReason = pageData.getExceptionReason();
+        //排产日期和班次
+        String scheduledDate = pageData.getScheduledDate();
+        String shiftNo = pageData.getShiftDesc();
         //首先调用校验的方法
         this.checkFinishRollWithNoFqc(inMap);
 
@@ -2178,7 +2181,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //6.调用存储过程 处理Sfdc和派工单
         this.finishRollProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, rollNo, sfdcReportedQty, sfdcApprovedQty,
                 sfdcSetupTime, sfdcProdTime, sfdcDownTime, eventTime, tillTime, remark,
-                sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId, reportedTime);
+                sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId, reportedTime, scheduledDate, shiftNo);
         //7.正常结束卷还是 异常下机
         if ("Y".equalsIgnoreCase(exceptionFlag)) {
             this.finishRollProcessException(site, orderNo, itemNo, seqNo, rollNo, exceptionReason, username);
@@ -2217,7 +2220,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      **/
     public void finishRollProcessSfdcAndSchedule(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float sfdcReportedQty, Float sfdcApproveQty,
                                                  Float sfdcSetupTime, Float sfdcProdTime, Float sfdcDownTime, String eventTime, String tillTime, String remark,
-                                                 Float sfdcSetupDownTime, Float sfdcProdSetupTime, Float defectedQty, Float sfdcManufactureTime, String username, String reportedTime) {
+                                                 Float sfdcSetupDownTime, Float sfdcProdSetupTime, Float defectedQty, Float sfdcManufactureTime, String username, String reportedTime, String scheduledDate, String shiftNo) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -2240,6 +2243,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(sfdcManufactureTime);
         params.add(username);
         params.add(reportedTime);
+        params.add(scheduledDate);
+        params.add(shiftNo);
         //执行存储过程
         procedureMapper.execProduceData("finishRollProcessSfdcAndSchedule", params);
     }
@@ -4155,6 +4160,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         Float sfdcManufactureTime = pageData.getSfdcManufactureTime();//制造时间
         String exceptionFlag = pageData.getExceptionFlag();
         String exceptionReason = pageData.getExceptionReason();
+        //班次和排产日期
+        String scheduledDate = pageData.getScheduledDate();
+        String shiftNo = pageData.getShiftDesc();
         //首先调用校验的方法
         this.checkRepackFinishRollWithNoFqc(inMap);
 
@@ -4177,7 +4185,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //6.调用存储过程 处理Sfdc和派工单
         this.finishRollProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, rollNo, sfdcReportedQty, sfdcApprovedQty,
                 sfdcSetupTime, sfdcProdTime, sfdcDownTime, eventTime, tillTime, remark,
-                sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId, reportedTime);
+                sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId, reportedTime, scheduledDate, shiftNo);
         //7.正常结束卷还是 异常下机
         if ("Y".equalsIgnoreCase(exceptionFlag)) {
             this.finishRollProcessException(site, orderNo, itemNo, seqNo, rollNo, exceptionReason, username);