Merge branch 'uat-temp-wj-2501090000-44517' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackageProgressService.java

@@ -52,8 +52,11 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
                 packageDataContextList = packageDataContextList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesPackageDataContext::getModifyDatetime).reversed()).collect(Collectors.toList());
 
                 //列表展示: 包装条码, 装箱个数, 包装规格数量, 装箱开始时间, 装箱结束时间
-                resultList.add(new MesPackageDataContext(packageDataContextList.get(0).getPackageNo(), new Double(packageDataContextList.size()),
-                        packageDataContextList.get(0).getPackSpecQty(), packageDataContextList.get(0).getCreateDatetime(), packageDataContextList.get(0).getModifyDatetime()));
+                resultList.add(new MesPackageDataContext(
+                        packageDataContextList.get(0).getPartNo(), packageDataContextList.get(0).getPartName(),
+                        packageDataContextList.get(0).getPackageNo(), new Double(packageDataContextList.size()),
+                        packageDataContextList.get(0).getPackSpecQty(), packageDataContextList.get(0).getCreateDatetime(), packageDataContextList.get(0).getModifyDatetime())
+                );
             }
 
             resultList = resultList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesPackageDataContext::getModifyDatetime).reversed()).collect(Collectors.toList());
@@ -76,8 +79,8 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
                     String.format("生产线[%s]工位[%s]强制打包失败,当前已无零件号[%s]未封箱状态的包装信息!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), packageDataContext.getPartNo()));
         }
 
-        MesPackageDataContext packageDataContextCached = JSONObject.parseObject(packageDataContextMap.get(packageDataContext.getPartNo()), MesPackageDataContext.class);
-        if (null == packageDataContextCached || !packageDataContextCached.getPackageNo().equals(packageDataContext.getPackageNo())) {
+        List<MesPackageDataContext> packageDataContextList = JSONObject.parseArray(packageDataContextMap.get(packageDataContext.getPartNo()), MesPackageDataContext.class);
+        if (CollectionUtils.isEmpty(packageDataContextList) || !packageDataContextList.get(0).getPackageNo().equals(packageDataContext.getPackageNo())) {
             return packResultMap(reqBean, resultBean, resultMap,
                     String.format("生产线[%s]工位[%s]强制打包失败,打包进度列表中已经不存在包装条码[%s],请刷新重试!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), packageDataContext.getPackageNo()));
         }
@@ -89,7 +92,7 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
         }
 
         StepResult stepResult = StepResult.getSuccessComplete();
-        doForcePrint(reqBean, resultBean, stepResult, packageDataContextCached, packageDb);
+        doForcePrint(reqBean, resultBean, stepResult, packageDataContextList, packageDb);
         if (!StringUtils.isEmpty(stepResult.getMsg())) {
             return packResultMap(reqBean, resultBean, resultMap,
                     String.format("生产线[%s]工位[%s]强制打包失败,%s", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), stepResult.getMsg()));
@@ -106,11 +109,11 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
         return resultMap;
     }
 
-    private void doForcePrint(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesPackageDataContext packageDataContext, MesPackage packageDb) {
-        packageNoGenerateStepService.savePackageDb(reqBean, packageDb, packageDb.getQty().intValue(), true);
+    private void doForcePrint(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, List<MesPackageDataContext> packageDataContextList, MesPackage packageDb) {
+        packageNoGenerateStepService.savePackageDb(reqBean, packageDb, packageDataContextList.size(), true);
         List<MesPackage> packageList = new ArrayList<>();
         packageList.add(packageDb);
-        packageNoGenerateStepService.execPrint(reqBean, resultBean, stepResult, packageDataContext, null, null, packageList, true);
+        packageNoGenerateStepService.execPrint(reqBean, resultBean, stepResult, packageDataContextList.get(0), null, null, packageList, true);
     }
 
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageDataContext.java

@@ -36,7 +36,9 @@ public class MesPackageDataContext extends MesPackageRuleContext implements Seri
 
     public MesPackageDataContext() {}
 
-    public MesPackageDataContext(String packageNo, Double qty, Double packSpecQty, String createDatetime, String modifyDatetime) {
+    public MesPackageDataContext(String partNo, String partName, String packageNo, Double qty, Double packSpecQty, String createDatetime, String modifyDatetime) {
+        this.partNo = partNo;
+        this.partName = partName;
         this.packageNo = packageNo;
         this.qty = qty;
         this.packSpecQty = packSpecQty;