45455 裁片生产过程控制，产品加工记录数量保存数据不对

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java

@@ -169,7 +169,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
         try {
             if (listAllPackBean == null) {
                 //默认查询所有
-                listAllPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+                listAllPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode());
             }
             List<T> list = getBaseService().findAll(listAllPackBean);
             afterList(list);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCutSchemeController.java

@@ -1,19 +1,27 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutScheme;
+import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeMaterial;
+import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeMaterialRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 裁片工单
@@ -23,4 +31,26 @@ import java.util.List;
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCutScheme")
 public class MesCutSchemeController extends BaseMesController<MesCutScheme>{
 
+    @Autowired
+    private MesCutSchemeMaterialRepository cutSchemeMaterialRepository;
+    //查询后执行
+    public void afterList(List<MesCutScheme> mesCutSchemes) {
+
+        List<String> cutCodes = mesCutSchemes.stream().map(MesCutScheme::getCutCode).collect(Collectors.toList());
+
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode());
+        DdlPreparedPack.getInPackList(cutCodes, "cutCode", ddlPackBean);
+        List<MesCutSchemeMaterial> mesCutSchemeMaterials = cutSchemeMaterialRepository.findByHqlWhere(ddlPackBean);
+        if (CollectionUtils.isEmpty(mesCutSchemeMaterials)) {
+            return;
+        }
+        Map<String,List<MesCutSchemeMaterial>> materialMap = mesCutSchemeMaterials.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode));
+
+        for (MesCutScheme mesCutScheme : mesCutSchemes) {
+            List<MesCutSchemeMaterial> list = materialMap.get(mesCutScheme.getCutCode());
+            mesCutScheme.setPartNos(list.stream().map(MesCutSchemeMaterial::getPartNo).map(String::valueOf).collect(Collectors.joining(",")));
+        }
+
+
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanMapUtilsExt;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
@@ -27,8 +28,7 @@ public class MesCutSchemeService extends BaseMesService<MesCutScheme> implements
 
     @Autowired
     private MesWorkCenterRepository workCenterRepository;
-    @Autowired
-    private MesCutSchemeMaterialRepository cutSchemeMaterialRepository;
+
 
     protected void setPackQueryBean(MesCutScheme bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
@@ -97,24 +97,5 @@ public class MesCutSchemeService extends BaseMesService<MesCutScheme> implements
         //}
     }
 
-    //查询后执行
-    public void afterList(List<MesCutScheme> mesCutSchemes) {
-
-        List<String> cutCodes = mesCutSchemes.stream().map(MesCutScheme::getCutCode).collect(Collectors.toList());
-
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
-        DdlPreparedPack.getInPackList(cutCodes, "cutCode", ddlPackBean);
-        List<MesCutSchemeMaterial> mesCutSchemeMaterials = cutSchemeMaterialRepository.findByHqlWhere(ddlPackBean);
-        if (CollectionUtils.isEmpty(mesCutSchemeMaterials)) {
-            return;
-        }
-        Map<String,List<MesCutSchemeMaterial>> materialMap = mesCutSchemeMaterials.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode));
-
-        for (MesCutScheme mesCutScheme : mesCutSchemes) {
-            List<MesCutSchemeMaterial> list = materialMap.get(mesCutScheme.getCutCode());
-            mesCutScheme.setPartNos(list.stream().map(MesCutSchemeMaterial::getPartNo).map(String::valueOf).collect(Collectors.joining(",")));
-        }
 
-
-    }
 }