|
|
@ -1284,6 +1284,12 @@ public class SchedulingServiceImpl implements SchedulingService { |
|
|
boolean checkFlag = inData.isCheckFlag(); |
|
|
boolean checkFlag = inData.isCheckFlag(); |
|
|
Float scheduledQty = inData.getScheduledQty(); |
|
|
Float scheduledQty = inData.getScheduledQty(); |
|
|
String calendarId = calendarMap.get("calendarId").toString(); |
|
|
String calendarId = calendarMap.get("calendarId").toString(); |
|
|
|
|
|
Integer rowCount = inData.getRowCount() != null ? inData.getRowCount() : 0; |
|
|
|
|
|
Integer rollCount = inData.getRollCount(); |
|
|
|
|
|
String carrierNo = inData.getCarrierNo(); |
|
|
|
|
|
if (carrierNo == null || carrierNo.isEmpty()) { |
|
|
|
|
|
carrierNo = "*"; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//判断是否校验总数量 |
|
|
//判断是否校验总数量 |
|
|
if (checkFlag) { |
|
|
if (checkFlag) { |
|
|
@ -1299,7 +1305,7 @@ public class SchedulingServiceImpl implements SchedulingService { |
|
|
} |
|
|
} |
|
|
//验证通过 继续执行排产操作 |
|
|
//验证通过 继续执行排产操作 |
|
|
Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, |
|
|
Map<String, Object> resultMap = this.scheduleWorkOrder(site, orderNo, itemNo, workCenterNo, resourceId, scheduledQty, |
|
|
specifiedTime, scheduleDate, scheduleTime, calendarId, username, 0, 0, "*"); |
|
|
|
|
|
|
|
|
specifiedTime, scheduleDate, scheduleTime, calendarId, username, rowCount, rollCount, carrierNo); |
|
|
//判断是否检验成功 |
|
|
//判断是否检验成功 |
|
|
String resultCode = String.valueOf(resultMap.get("resultCode")); |
|
|
String resultCode = String.valueOf(resultMap.get("resultCode")); |
|
|
if ("400".equalsIgnoreCase(resultCode)) { |
|
|
if ("400".equalsIgnoreCase(resultCode)) { |
|
|
|