吸塑

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesStationMatchAssemblyStepService.java

@@ -149,7 +149,7 @@ public class MesStationMatchAssemblyStepService extends BaseStepService {
             List<String> containerSnList = null;
             for (MesContainerPackageDetailContext containerPackageDetailContext : containerSnStationList) {
                 if (null == containerPackageDetailContext || StringUtils.isEmpty(containerPackageDetailContext.getPartNo())) continue;
-                if (!containerPackageDetailContext.getPartNo().equals(productionAssemblyContext.getPartNo()) || MathOperation.compareTo(containerPackageDetailContext.getRemainQty(), new Double(0)) <= 0) continue;
+                if (!containerPackageDetailContext.getPartNo().equals(productionAssemblyContext.getAssemblyPartNo()) || MathOperation.compareTo(containerPackageDetailContext.getRemainQty(), new Double(0)) <= 0) continue;
 
                 //验证时效性
                 Map<String, Object> result = timeEfficientCfgMatchService.checkSnTimelinessContainerMatch(reqBean.getOrganizeCode(), containerPackageDetailContext,

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionCustomContextStepService.java

@@ -413,8 +413,11 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
         containerSnStationList.stream().forEach(o -> {
             String key = getContainerSnAtomicityKey(organizeCode, o);
             Boolean success = dispatchFsmBusiDataAtomicity(organizeCode, key, o.getQty().toString(), MesPcnEnumUtil.EXPIRE_TIME.DEFAULT.getValue());
-            if (success) o.remainQty(o.getQty());
+            if (success) {
-            else o.remainQty(getFsmBusiData(organizeCode, key));
+                o.remainQty(o.getQty());
+            } else {
+                o.remainQty(getFsmBusiData(organizeCode, key));
+            }
         });
     }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java

@@ -593,7 +593,7 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
     @Override
     public Double getOrderQtyDialogContext(StationRequestBean reqBean) {
         String orderQty = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.ORDER_QTY_DIALOG_CONTEXT);
-        return StringUtils.isEmpty(orderQty) ? new Double(0) : new Double(orderQty);
+        return StringUtils.isEmpty(orderQty) ? new Double(1) : new Double(orderQty);
     }
 
     //获取弹框输入的工单数量