报工调整

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -430,7 +430,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         //物料+生产版本获取bom信息
         List<MesBom> mesBoms = getBomList(mesPart.getOrganizeCode(), mesPart, mesProductVersion.getAlternativePartList());
         //报工类型
-        if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrderDb.getReportType()) {
+        if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrder.getReportType()) {
             mesWorkOrderDb.setReportedQty(MathOperation.add(mesWorkOrder.getNum(), mesWorkOrderDb.getReportedQty()));
             //更新工单状态
             double unCompleteQty = MathOperation.sub(mesWorkOrderDb.getQty(), mesWorkOrderDb.getReportedQty());
@@ -444,13 +444,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
         } else {
+            //报工调整数量加-
+            mesWorkOrderDb.setAdjustQty((MathOperation.add(mesWorkOrder.getNum(), mesWorkOrderDb.getAdjustQty())));
             //冲销数量大于工单完成数量报错
-            if (MathOperation.add(mesWorkOrder.getNum(),mesWorkOrderDb.getAdjustQty()) > mesWorkOrderDb.getReportedQty()) {
+            if (mesWorkOrderDb.getAdjustQty() > mesWorkOrderDb.getReportedQty()) {
                 MesException.throwMesBusiException("冲销数量【%s】大于工单完成数量【%s】,不允许冲销",
-                        mesWorkOrder.getNum(), mesWorkOrderDb.getReportedQty());
+                        mesWorkOrderDb.getAdjustQty(), mesWorkOrderDb.getReportedQty());
             }
-            //报工调整数量加-
-            mesWorkOrderDb.setAdjustQty((MathOperation.add(mesWorkOrder.getNum(), mesWorkOrderDb.getAdjustQty())));
         }
         //更新工单
         updateMesWorkOrder(mesWorkOrderDb);
@@ -548,7 +548,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
         //报工类型
         //报工
-        if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrder.getReportType()) {
+        if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrderNew.getReportType()) {
             mesWorkOrder.setReportedQty(MathOperation.add(mesWorkOrderNew.getNum(), mesWorkOrder.getReportedQty()));
             //更新工单状态
             double unCompleteQty = MathOperation.sub(mesWorkOrder.getQty(), mesWorkOrder.getReportedQty());
@@ -561,13 +561,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
         } else {
+            //报工调整数量加-
+            mesWorkOrder.setAdjustQty((MathOperation.add(mesWorkOrderNew.getNum(), mesWorkOrder.getAdjustQty())));
             //冲销数量大于工单完成数量报错
-            if (MathOperation.add(mesWorkOrder.getNum(),mesWorkOrder.getAdjustQty()) > mesWorkOrder.getReportedQty()) {
+            if (mesWorkOrder.getAdjustQty() > mesWorkOrder.getReportedQty()) {
                 MesException.throwMesBusiException("冲销数量【%s】大于工单完成数量【%s】,不允许冲销",
-                        mesWorkOrderNew.getNum(), mesWorkOrder.getReportedQty());
+                        mesWorkOrder.getAdjustQty(), mesWorkOrder.getReportedQty());
             }
-            //报工调整数量加-
-            mesWorkOrder.setAdjustQty((MathOperation.add(mesWorkOrderNew.getNum(), mesWorkOrder.getAdjustQty())));
         }
         //获取生产版本
         MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder);