查询条件没加工厂代码排查

modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesLoadingListDetail.groovy

@@ -53,7 +53,9 @@ class MesToPiscesMesLoadingListDetail {
             if (!StringUtils.isEmpty(rowMap.get("pid"))) {
                 long id = Long.parseLong(String.valueOf(rowMap.get("pid")));
                 if (Objects.isNull(mesLoadingListMap) || !mesLoadingListMap.containsKey(id)) {
-                    mesLoadingListMap.put(id, mesLoadingListRepository.getById(id))
+                    DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode)
+                    DdlPreparedPack.getNumEqualPack(id,"id",packBean)
+                    mesLoadingListMap.put(id, mesLoadingListRepository.getByProperty(packBean))
                 }
                 MesLoadingList mesLoadingList = mesLoadingListMap.get(id)
                 if (!Objects.isNull(mesLoadingList)) {

modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesShippingDetail.groovy

@@ -51,7 +51,9 @@ class MesToPiscesMesShippingDetail  {
             if (!StringUtils.isEmpty(rowMap.get("pid"))) {
                 long id = Long.parseLong(String.valueOf(rowMap.get("pid")));
                 if (Objects.isNull(mesProductionRecordMap) || !mesProductionRecordMap.containsKey(id)) {
-                    mesProductionRecordMap.put(id, mesShippingRepository.getById(id))
+                    DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode)
+                    DdlPreparedPack.getNumEqualPack(id,"id",packBean)
+                    mesProductionRecordMap.put(id, mesShippingRepository.getByProperty(packBean))
                 }
                 MesShippingOrderManagement mesProductionRecord = mesProductionRecordMap.get(id)
                 if (!Objects.isNull(mesProductionRecord)) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java

@@ -58,22 +58,7 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob {
                 throw new IllegalArgumentException("jobc参数为空，请检查参数");
             }
 
-            Map<String, Object> paramMap = new HashMap<>();
+            String[] organizeCodeList = jobParam.split(",");
-
-            try {
-                paramMap = (Map<String, Object>) JSONObject.parse(jobParam);
-            } catch (Exception e) {
-                LOGGER.error("参数格式不是JSON");
-                return;
-
-            }
-
-            if (CollectionUtils.isEmpty(paramMap)) {
-                LOGGER.error("检测数据同步定时任务,没有配置参数");
-                return;
-            }
-
-            List<String> organizeCodeList = (List<String>) paramMap.get("org");
 
             for (String organizeCode : organizeCodeList) {
 
@@ -83,7 +68,6 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob {
 
         } catch (Exception e) {
             LOGGER.error("SAP接口表数据同步作业任务结束e:{}", e.toString());
-            //sendErrorMessage(e.toString());
         }
     }
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesSendOutTimeReworkOrderEmailJob.java

@@ -92,8 +92,7 @@ public class MesSendOutTimeReworkOrderEmailJob extends BaseMesScheduleJob {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_STATUS.CREATE.getValue(), "status", packBean);
         packBean.setWhereAppend(packBean.getWhereAppend() + " and model.createDatetime <= '" + TimeTool.pareDateToString(DateUtil.addMinutes(new Date(), -minutes)) + "'");
-        List<MesReworkTask> mesReworkTaskList = mesReworkTaskRepository.findByHqlWhere(packBean);
+        return mesReworkTaskRepository.findByHqlWhere(packBean);
-        return mesReworkTaskList;
     }
 
 }

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

@@ -72,7 +72,7 @@ public class MesLabelTemplateServiceImpl extends BaseMesService<MesLabelTemplate
         if (mesLabelTemplate != null) {
             //级联获取labelTemplateParam
             DdlPackBean templateParamPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-            DdlPreparedPack.getNumEqualPack(mesLabelTemplate.getId(), "templateId", templateParamPackBean);
+            DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", templateParamPackBean);
             List<MesLabelTemplateParam> params = mesLabelTemplateParamRDao.findByHqlWhere(templateParamPackBean);
             mesLabelTemplate.setLabelTemplateParamList(params);
         }

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

@@ -83,7 +83,7 @@ public class MesPartService extends BaseMesService<MesPart> implements IMesPartS
 
     @Override
     public ListPager<MesPart> queryMesPartByPagerExt(MesPart mesPart, Pager pager) {
-        DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean(mesPart.getOrganizeCode());
         DdlPreparedPack.getNumEqualPack(mesPart.getIsValid(), "isValid", partQueryPackBean);
         DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", partQueryPackBean);
         DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", partQueryPackBean);

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

@@ -33,7 +33,7 @@ public class MesProductVersionService extends BaseMesService<MesProductVersion>
 
     @Override
     public ListPager<MesProductVersion> queryMesProductVersionByPagerExt(MesProductVersion mesProductVersion, Pager pager) {
-        DdlPackBean productVersionQueryPackBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean productVersionQueryPackBean = DdlPackBean.getDdlPackBean(mesProductVersion.getOrganizeCode());
         DdlPreparedPack.getNumEqualPack(mesProductVersion.getIsValid(), "isValid", productVersionQueryPackBean);
         DdlPreparedPack.getStringLikerPack(mesProductVersion.getProductVersion(), "productVersion", productVersionQueryPackBean);
         DdlPreparedPack.getStringLikerPack(mesProductVersion.getPartNo(), "partNo", productVersionQueryPackBean);

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

@@ -182,7 +182,9 @@ public class MesQmsSuspiciousService extends BaseMesService<MesQmsSuspicious> im
                     }
                     //计算返工数量
                     if (mesPartInspection.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.REWORK.getValue()) {
-                        MesReworkTask reworkTask = mesReworkTaskRepository.getById(mesPartInspection.getReworkTaskId());
+                        packBean = DdlPackBean.getDdlPackBean(organizeCode);
+                        DdlPreparedPack.getNumEqualPack(mesPartInspection.getReworkTaskId(),"id",packBean);
+                        MesReworkTask reworkTask = mesReworkTaskRepository.getByProperty(packBean);
                         if (!StringUtil.isEmpty(reworkTask)) {
                             //返工是否完成
                             if (reworkTask.getStatus() == MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue()) {

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesLabelTemplateService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderCutService;
 import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
@@ -60,13 +61,10 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
     private MesWorkOrderCutDetailRepository workOrderCutDetailRepository;
 
     @Autowired
-    private MesLabelTemplateRepository labelTemplateRepository;
+    private IMesPrintedSnLogRepository printedSnLogRepository;
-
-    @Autowired
-    private MesLabelTemplateParamRepository labelTemplateParamRepository;
 
     @Autowired
-    private IMesPrintedSnLogRepository printedSnLogRepository;
+    private IMesLabelTemplateService mesLabelTemplateService;
 
     protected void setPackQueryBean(MesWorkOrderCut bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getCutWorkOrderNo(), MesExtConstWords.CUT_WORK_ORDER_NO, packBean);
@@ -370,7 +368,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
             MesCutScheme cutScheme = entry.getValue();
             List<MesWorkOrderCut> workOrderCutList = workOrderCutMapByCutCode.get(cutScheme.getCutCode());
 
-            MesLabelTemplate labelTemplate = getLabelTemplate(cutScheme.getTemplateCode(), organizeCode);
+            MesLabelTemplate labelTemplate = mesLabelTemplateService.getLabelTemplate(cutScheme.getTemplateCode(), organizeCode);
 
             //模板信息丢失抛出异常
             if (labelTemplate == null)
@@ -421,20 +419,6 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
     }
 
-    private MesLabelTemplate getLabelTemplate(String templateCode, String organizeCode) {
-        DdlPackBean templatePackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(templateCode, MesExtConstWords.TEMPLATE_CODE, templatePackBean);
-        MesLabelTemplate mesLabelTemplate = labelTemplateRepository.getByProperty(templatePackBean);
-        if (mesLabelTemplate != null) {
-            //级联获取labelTemplateParam
-            DdlPackBean templateParamPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-            DdlPreparedPack.getNumEqualPack(mesLabelTemplate.getId(), "templateId", templateParamPackBean);
-            List<MesLabelTemplateParam> params = labelTemplateParamRepository.findByHqlWhere(templateParamPackBean);
-            mesLabelTemplate.setLabelTemplateParamList(params);
-        }
-        return mesLabelTemplate;
-    }
-
     @Override
     public void doUpdatePrintStatus(List<String> cutWorkOrderIds, String organizeCode, String userName) {
 

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.apiservice.dao.IEquipmentExtDao;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.mes.api.iservice.base.IEnumService;
@@ -222,7 +223,9 @@ public class ProdExtOrgService implements IProdExtOrgService {
     public MesArea updateMesArea(MesArea mesArea) {
 
         //对id做有效性校验
-        MesArea mesAreaDb = areaRepository.getById(mesArea.getId());
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(mesArea.getId(),"id",packBean);
+        MesArea mesAreaDb = areaRepository.getByProperty(packBean);
         if (mesAreaDb == null) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java

@@ -58,9 +58,9 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
 
 
 
-        Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList);
+        Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList,model.getOrganizeCode());
 
-        List<MesCutSchemeMaterial> cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList);
+        List<MesCutSchemeMaterial> cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList, model.getOrganizeCode());
         //根据裁片方案代码对裁片方案原材料分组
         Map<String, List<MesCutSchemeMaterial>> cutSchemeMaterialMapByCutCode = cutSchemeMaterialList.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode));
 
@@ -151,12 +151,11 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
         return val == null ? "" : val.toString();
     }
 
-    private Map<String, List<MesCutSchemeFg>> getCutSchemeFgMapByCutCode(List<String> cutCodeList) {
+    private Map<String, List<MesCutSchemeFg>> getCutSchemeFgMapByCutCode(List<String> cutCodeList,String organizeCode) {
-        List<MesCutSchemeFg> cutSchemeFgList = getMesCutSchemeFgs(cutCodeList);
+        List<MesCutSchemeFg> cutSchemeFgList = getMesCutSchemeFgs(cutCodeList,organizeCode);
 
         //根据裁片方案代码对裁片方案成品明细分组
-        Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode));
+        return cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode));
-        return cutSchemeFgMapByCutCode;
     }
 
     private BigDecimal[] divideAndRemainder(Double qty, Double packageQty) {
@@ -178,22 +177,19 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
     private List<MesCutSchemeEquipment> getMesCutSchemeEquipments(MesProduceSnPrintModel model, List<String> cutCodeList) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
         DdlPreparedPack.getInPackList(cutCodeList, MesExtConstWords.CUT_CODE, packBean);
-        List<MesCutSchemeEquipment> cutSchemeEquipmentList = cutSchemeEquipmentRepository.findByHqlWhere(packBean);
+        return cutSchemeEquipmentRepository.findByHqlWhere(packBean);
-        return cutSchemeEquipmentList;
     }
 
-    private List<MesCutSchemeMaterial> getMesCutSchemeMaterials(List<String> cutCodeList) {
+    private List<MesCutSchemeMaterial> getMesCutSchemeMaterials(List<String> cutCodeList,String organizeCode) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getInPackList(cutCodeList, MesExtConstWords.CUT_CODE, packBean);
-        List<MesCutSchemeMaterial> cutSchemeMaterialList = cutSchemeMaterialRepository.findByHqlWhere(packBean);
+        return cutSchemeMaterialRepository.findByHqlWhere(packBean);
-        return cutSchemeMaterialList;
     }
 
-    private List<MesCutSchemeFg> getMesCutSchemeFgs(List<String> cutCodeList) {
+    private List<MesCutSchemeFg> getMesCutSchemeFgs(List<String> cutCodeList,String organizeCode) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getInPackList(cutCodeList, MesExtConstWords.CUT_CODE, packBean);
-        List<MesCutSchemeFg> cutSchemeFgList = cutSchemeFgRepository.findByHqlWhere(packBean);
+        return cutSchemeFgRepository.findByHqlWhere(packBean);
-        return cutSchemeFgList;
     }
 
     private List<Map<String, Object>> packResultMapList(MesProduceSnPrintModel printModel, List<Map<String, Object>> printTemplateDateList) {