2026-03-25

优化

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

@@ -2221,9 +2221,9 @@ public class ScheduleServiceImpl implements ScheduleService {
             if (netIssueQty < 0) {
                 throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200176));
             }
-            if (netIssueQty > transQty) {
-                throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200177));
-            }
+//            if (netIssueQty > transQty) {
+//                throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200177));
+//            }
             int orderFirstItemNo = getOrderFirstItemNo(site, orderNo);
             //判断是否是正常的报工
             if ("N".equalsIgnoreCase(createNewRollFlag) && itemNo != orderFirstItemNo) {
@@ -2232,7 +2232,7 @@ public class ScheduleServiceImpl implements ScheduleService {
                 }
             }
             //调用存储过程校验每一个卷的数量
-            Map<String, Object> resultMap = this.checkFinishRollWithSfdcMaterialHist(site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo, username);
+            Map<String, Object> resultMap = this.checkFinishRollWithSfdcMaterialHist(site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo, username, transQty);
             //区分是否抛出异常的信息
             String resultCode = String.valueOf(resultMap.get("resultCode"));
             if ("400".equalsIgnoreCase(resultCode)) {
@@ -2277,7 +2277,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      * @Param [site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo]
      **/
     public Map<String, Object> checkFinishRollWithSfdcMaterialHist(String site, String orderNo, Integer itemNo, String rollNo, String seqNo, Float editTotalReportQty, Float otherRollQty,
-                                                                   Double editNewRollQty, Float netIssueQty, Integer histSeqNo, String username) {
+                                                                   Double editNewRollQty, Float netIssueQty, Integer histSeqNo, String username, Float transQty) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -2290,6 +2290,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(netIssueQty);
         params.add(histSeqNo);
         params.add(username);
+        params.add(transQty);
         //执行存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkFinishRollWithSfdcMaterialHist", params);
         //返回执行的结果

src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@@ -374,7 +374,6 @@
         A.CreatedDate,
         B.OrderNo as consumeOrderNo,
         B.SeqNo as consumeSeqNo,
-        B.
         B.ItemNo as consumeItemNo,
         B.StartDate as date1,
         B.ReportDate as date2,