Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

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

@@ -229,7 +229,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             }
         }
         //在加工的工单不能修改物料信息
-        if (result.getWorkOrderStatus() >= MesExtEnumUtil.ORDER_STATUS.process.getValue()) {
+        if (result.getWorkOrderStatus() >= MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) {
             if (!Objects.equals(bean.getPartNo(), result.getPartNo())) {
                 MesException.throwMesBusiException(String.format("工单状态为【%s】不允许修改物料",
                         MesExtEnumUtil.ORDER_TYPE.valueOfDescription(result.getWorkOrderStatus())));
@@ -532,7 +532,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         } else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) {
             mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
         } else {
-            mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.process.getValue());
+            mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
         }
         update(mesWorkOrder);
 
@@ -583,7 +583,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         } else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) {
             mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
         } else {
-            mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.process.getValue());
+            mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
         }
         //获取生产版本
         MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder);
@@ -818,7 +818,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     @Override
     public List<MesWorkOrder> queryMesWorkOrderProcessToSap(String organizeCode) {
         List<Integer> statusList = new ArrayList<>();
-        statusList.add(MesExtEnumUtil.ORDER_STATUS.process.getValue());
+        statusList.add(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
 //        statusList.add(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue());
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);