From c7c682a2c50a2770834548c689edf14a00f95865 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Thu, 17 Mar 2022 13:24:50 +0800 Subject: [PATCH] =?UTF-8?q?FQC=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SchedulingServiceImpl.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java index 2ca84b4..dba85a3 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java +++ b/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 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 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)) {