|
|
|
@ -2224,13 +2224,13 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
// if (netIssueQty > transQty) { |
|
|
|
// throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200177)); |
|
|
|
// } |
|
|
|
int orderFirstItemNo = getOrderFirstItemNo(site, orderNo); |
|
|
|
// int orderFirstItemNo = getOrderFirstItemNo(site, orderNo); |
|
|
|
//判断是否是正常的报工 |
|
|
|
if ("N".equalsIgnoreCase(createNewRollFlag) && itemNo != orderFirstItemNo) { |
|
|
|
if (netIssueQty.floatValue() != transQty.floatValue()) { |
|
|
|
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200178)); |
|
|
|
} |
|
|
|
} |
|
|
|
// if ("N".equalsIgnoreCase(createNewRollFlag) && itemNo != orderFirstItemNo) { |
|
|
|
// if (netIssueQty.floatValue() != transQty.floatValue()) { |
|
|
|
// throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200178)); |
|
|
|
// } |
|
|
|
// } |
|
|
|
//调用存储过程校验每一个卷的数量 |
|
|
|
Map<String, Object> resultMap = this.checkFinishRollWithSfdcMaterialHist(site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo, username, transQty); |
|
|
|
//区分是否抛出异常的信息 |
|
|
|
|