Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht

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

@@ -188,14 +188,15 @@ public class MesStationMatchAssemblyStepService extends BaseStepService {
                 }
                 stepResult.isCompleted(false).msg(String.format("容器条码扣减装配件时验证零件号[%s]当前缺料,请扫描上料条码!", productionAssemblyContext.getPartNo()));
                 break;
-            }
+            } else {
-
                 productionAssemblyContext.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
                 productionAssemblyContext.setAssemblySn(containerSnList.get(0));
                 productionAssemblyContext.setMatchDatetime((new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SSS)).format(new Date()));
                 productionAssemblyContext.setContainerSnData(JSONObject.toJSONString(containerSnDataList));
             }
 
+        }
+
         return productionAssemblyContextList;
     }