44263 PCN装箱防错：满箱关箱后，提示“当前箱条码已完成装箱。请扫描下一个箱条码”

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java

@@ -26,10 +26,10 @@ public interface IMesBoxingErrorProofingService {
     Integer getIsMemory(String organizeCode, String userName);
 
     @ApiOperation(value = "扫描")
-    MesPackage doScan(MesPackageDetail mesPackageDetail);
+    ResultBean doScan(MesPackageDetail mesPackageDetail);
 
     @ApiOperation(value = "保存包装明细")
-    MesPackage saveMesPackageDetails(List<MesPackageDetail> mesPackage, String userName);
+    ResultBean saveMesPackageDetails(List<MesPackageDetail> mesPackage, String userName);
 
     @ApiOperation(value = "更新包装表")
     ResultBean updateMesPackage(MesPackage mesPackage);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java

@@ -74,8 +74,7 @@ public class MesBoxingErrorProofingController {
 
             mesPackageDetail.setOrganizeCode(!StringUtils.isEmpty(mesPackageDetail.getOrganizeCode())?mesPackageDetail.getOrganizeCode():AuthUtil.getOrganizeCode());
             ConvertBean.serviceModelInitialize(mesPackageDetail,!StringUtils.isEmpty(mesPackageDetail.getModifyUser())?mesPackageDetail.getModifyUser():AuthUtil.getSessionUser().getUserName());
-            MesPackage mesPackage = mesBoxingErrorProofingService.doScan(mesPackageDetail);
+            return mesBoxingErrorProofingService.doScan(mesPackageDetail);
-            return ResultBean.success("扫描成功").setResultObject(mesPackage);
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {
@@ -94,8 +93,7 @@ public class MesBoxingErrorProofingController {
             });
             MesPackageDetail next = mesPackageDetailList.iterator().next();
             String userName = !StringUtils.isEmpty(next.getModifyUser())?next.getModifyUser():AuthUtil.getSessionUser().getUserName();
-            MesPackage mesPackage = mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName);
+            return mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName);
-            return ResultBean.success("保存成功").setResultObject(mesPackage);
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java

@@ -99,16 +99,14 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
     }
 
     @Override
-    public MesPackage doScan(MesPackageDetail mesPackageDetail) {
+    public ResultBean doScan(MesPackageDetail mesPackageDetail) {
         //获取包装定义
         MesPackingDefine packingDefine = getMesPackingDefine(mesPackageDetail);
         //扫描的是包装
         if (mesPackageDetail.getIsScanPackageBoolean()) {
             checkNotNull(mesPackageDetail);
             MesPackage mesPackage = getMesPackage(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getPackageNo());
-            if (Objects.nonNull(mesPackage)) {
+            if (Objects.isNull(mesPackage)) {
-                return mesPackage;
-            }else{
                 MesPart mesPart;
                 Double qty;
                 String packageOneCode = "";
@@ -133,9 +131,9 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                     //获取数量信息是否存在
                     qty = getQty(packingDefine, split);
                 }
-                MesPackage packages = getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode);
+                mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode));
-                return mesPackageRDao.insert(packages);
             }
+            return ResultBean.success("箱条码扫描成功，请扫产品条码！").setResultObject(mesPackage);
         } else {
             checkNotNull(mesPackageDetail);
             //校验过程条码是否存在
@@ -161,12 +159,15 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             //缓存是否记忆开关
             saveRedis(getKey(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getModifyUser()),mesPackageDetail.getIsMemory());
             mesPackage.setMesPackageDetail(saveMesPackageDetail);
-            return mesPackage;
+            if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
+                return ResultBean.success("当前箱条码已完成装箱，请扫描下一个箱条码！").setResultObject(mesPackage);
+            }
+            return ResultBean.success("产品条码扫描成功，请继续扫描产品条码！").setResultObject(mesPackage);
         }
     }
 
     @Override
-    public MesPackage saveMesPackageDetails(List<MesPackageDetail> mesPackageDetailList, String userName) {
+    public ResultBean saveMesPackageDetails(List<MesPackageDetail> mesPackageDetailList, String userName) {
         MesPackageDetail packageDetail = mesPackageDetailList.iterator().next();
         //校验包装条码信息
         MesPackage mesPackage = getMesPackageAndCheck(packageDetail.getPackageNo(), packageDetail.getOrganizeCode());
@@ -184,7 +185,10 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             //更新包装表
             updateMesPackage(mesPackage, userName, qty, false);
         }
-        return mesPackage;
+        if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
+            return ResultBean.success("当前箱条码已完成装箱，请扫描下一个箱条码！").setResultObject(mesPackage);
+        }
+        return ResultBean.success("提交成功，请继续扫描产品条码！").setResultObject(mesPackage);
     }
 
     @Override