代码 回退到 11日的版本

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 = "扫描")
-    ResultBean doScan(MesPackageDetail mesPackageDetail);
+    MesPackage doScan(MesPackageDetail mesPackageDetail);
 
     @ApiOperation(value = "保存包装明细")
-    ResultBean 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

@@ -74,7 +74,8 @@ 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());
-            return mesBoxingErrorProofingService.doScan(mesPackageDetail);
+            MesPackage mesPackage = mesBoxingErrorProofingService.doScan(mesPackageDetail);
+            return ResultBean.success("扫描成功").setResultObject(mesPackage);
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {
@@ -93,7 +94,8 @@ public class MesBoxingErrorProofingController {
             });
             MesPackageDetail next = mesPackageDetailList.iterator().next();
             String userName = !StringUtils.isEmpty(next.getModifyUser())?next.getModifyUser():AuthUtil.getSessionUser().getUserName();
-            return mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName);
+            MesPackage mesPackage = 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,14 +99,16 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
     }
 
     @Override
-    public ResultBean doScan(MesPackageDetail mesPackageDetail) {
+    public MesPackage doScan(MesPackageDetail mesPackageDetail) {
         //获取包装定义
         MesPackingDefine packingDefine = getMesPackingDefine(mesPackageDetail);
         //扫描的是包装
         if (mesPackageDetail.getIsScanPackageBoolean()) {
             checkNotNull(mesPackageDetail);
             MesPackage mesPackage = getMesPackage(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getPackageNo());
-            if (Objects.isNull(mesPackage)) {
+            if (Objects.nonNull(mesPackage)) {
+                return mesPackage;
+            }else{
                 MesPart mesPart;
                 Double qty;
                 String packageOneCode = "";
@@ -131,14 +133,14 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                     //获取数量信息是否存在
                     qty = getQty(packingDefine, split);
                 }
-                mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode));
+                MesPackage packages = getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode);
+                return mesPackageRDao.insert(packages);
             }
-            return ResultBean.success("箱条码扫描成功，请扫零件条码！").setResultObject(mesPackage);
         } else {
             checkNotNull(mesPackageDetail);
-            //校验零件条码是否存在
+            //校验过程条码是否存在
             if (StringUtils.isEmpty(mesPackageDetail.getSerialNumber())) {
-                MesPcnException.throwMesBusiException("零件条码不允许为空，请检查数据！");
+                MesPcnException.throwMesBusiException("过程条码不允许为空，请检查数据！");
             }
             //校验包装条码信息
             MesPackage mesPackage = getMesPackageAndCheck(mesPackageDetail.getPackageNo(), mesPackageDetail.getOrganizeCode());
@@ -159,15 +161,12 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             //缓存是否记忆开关
             saveRedis(getKey(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getModifyUser()),mesPackageDetail.getIsMemory());
             mesPackage.setMesPackageDetail(saveMesPackageDetail);
-            if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
-                return ResultBean.success("当前箱条码已完成装箱，请扫描下一个箱条码！").setResultObject(mesPackage);
-            }
-            return ResultBean.success("零件条码扫描成功，请继续扫描零件条码！").setResultObject(mesPackage);
+            return mesPackage;
         }
     }
 
     @Override
-    public ResultBean saveMesPackageDetails(List<MesPackageDetail> mesPackageDetailList, String userName) {
+    public MesPackage saveMesPackageDetails(List<MesPackageDetail> mesPackageDetailList, String userName) {
         MesPackageDetail packageDetail = mesPackageDetailList.iterator().next();
         //校验包装条码信息
         MesPackage mesPackage = getMesPackageAndCheck(packageDetail.getPackageNo(), packageDetail.getOrganizeCode());
@@ -185,10 +184,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             //更新包装表
             updateMesPackage(mesPackage, userName, qty, false);
         }
-        if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
-            return ResultBean.success("当前箱条码已完成装箱，请扫描下一个箱条码！").setResultObject(mesPackage);
-        }
-        return ResultBean.success("提交成功，请继续扫描零件条码！").setResultObject(mesPackage);
+        return mesPackage;
     }
 
     @Override

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

@@ -363,7 +363,6 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bomVersion, "bomVersion", ddlPackBean);
         DdlPreparedPack.getStringSmallerPack(TimeTool.getNowTime(true), "effStartTime", ddlPackBean);
-        DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime(true), "effEndTime", ddlPackBean);
         DdlPreparedPack.getOrderBy("effStartTime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean);
         List<MesBom> mesBoms = mesBomRDao.findByHqlWhere(ddlPackBean);
         if (org.springframework.util.CollectionUtils.isEmpty(mesBoms)) {