演示功能修改

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

@@ -26,7 +26,7 @@ public interface IMesBoxingErrorProofingService {
     MesPackage doScan(MesPackageDetail mesPackageDetail);
 
     @ApiOperation(value = "保存包装明细")
-    void saveMesPackageDetails(List<MesPackageDetail> mesPackage, String userName);
+    MesPackage 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

@@ -76,8 +76,8 @@ public class MesBoxingErrorProofingController {
                 ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空");
             });
             String userName = AuthUtil.getSessionUser().getUserName();
-            mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName);
+            MesPackage mesPackage = mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName);
-            return ResultBean.success("保存成功");
+            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

@@ -125,20 +125,25 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
     }
 
     @Override
-    public void saveMesPackageDetails(List<MesPackageDetail> mesPackageDetailList, String userName) {
+    public MesPackage saveMesPackageDetails(List<MesPackageDetail> mesPackageDetailList, String userName) {
         MesPackageDetail packageDetail = mesPackageDetailList.iterator().next();
-        int qty = mesPackageDetailList.size();
         //校验包装条码信息
         MesPackage mesPackage = getMesPackageAndCheck(packageDetail.getPackageNo(), packageDetail.getOrganizeCode());
+        //校验是否已关闭
+        if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesPackage.getIsSealed()) {
+            MesPcnException.throwMesBusiException("箱条码已封箱，不允许扫描零件条码");
+        }
         //去掉重复零件条码
         List<MesPackageDetail> saveMesPackageDetailList = new ArrayList<>();
         checkSerialNumber(saveMesPackageDetailList,mesPackageDetailList, packageDetail, userName);
         //保存包装明细
         if(!CollectionUtils.isEmpty(saveMesPackageDetailList)){
             mesPackageDetailRDao.saveAll(saveMesPackageDetailList);
+            int qty = saveMesPackageDetailList.size();
+            //更新包装表
+            updateMesPackage(mesPackage, userName, qty, false);
         }
-        //更新包装表
+        return mesPackage;
-        updateMesPackage(mesPackage, userName, qty, false);
     }
 
     @Override
@@ -291,6 +296,8 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                     saveMesPackageDetailList.add(mesPackageDetail);
                 }
             }
+        }else{
+            saveMesPackageDetailList.addAll(mesPackageDetailList);
         }
     }