FQC排产

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

@@ -404,10 +404,12 @@ public class SchedulingServiceImpl implements SchedulingService {
         int itemNo = pageData.getItemNo();
         String workCenterNo = pageData.getWorkCenterNo();
         String username = pageData.getUsername();
+        Date scheduleDate = pageData.getScheduleDate();
+        Date scheduleTime = pageData.getScheduleTime();
+        String specifiedTime = pageData.getSpecifiedTime();
         //循环插入派工单
         for(OperatorInData operatorData : operatorList){
             String resourceId = operatorData.getOperatorId();
-            Date scheduleDate = operatorData.getLastScheduledTime();
             float scheduledQty = operatorData.getQtyToSchedule();
             pageData.setResourceId(resourceId);
             //获取当前加工中心机台对应的calendarId
@@ -419,15 +421,7 @@ public class SchedulingServiceImpl implements SchedulingService {
             //设置查询的条件
             String calendarId = String.valueOf(calendarMap.get("calendarId"));
             //调用存储过程 执行排产的方法
-            Map<String, Object> resultMap = null;
-            //针对null特殊处理
-            if(null == scheduleDate){
-                Date currentScheduleDate = pageData.getScheduleDate();
-                Date scheduleTime = pageData.getScheduleTime();
-               resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, "Y", currentScheduleDate, scheduleTime, calendarId, username);
-            }else{
-                resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, "Y", scheduleDate, scheduleDate, calendarId, username);
-            }
+            Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, specifiedTime, scheduleDate, scheduleTime, calendarId, username);
             //判断是否检验成功
             String resultCode = String.valueOf(resultMap.get("resultCode"));
             if ("400".equalsIgnoreCase(resultCode)) {