Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCcscTaskService.java

@@ -16,4 +16,6 @@ public interface IMesCcscTaskService extends IBaseMesService<MesCcscTask> {
     MesCcscTask insert(MesWorkOrder mesWorkOrder,String testType,String orderNo,Integer frequency,Integer rule,Integer qtyRule);
 
     void doCcscTaskByMesWorkOrder(String organizeCode,List<MesWorkOrder> mesWorkOrderList);
+
+    void insertMesCcscTask(String organizeCode,List<MesWorkOrder> mesWorkOrderList);
 }

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java

@@ -40,7 +40,7 @@ public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
     void doReportWorkReversal(WmsProductModel model);
 
     @ApiOperation("重新打开")
-    void doReopen(String[] ids,String userName,String organizeCode);
+    void doReopen(Long[] ids,String userName,String organizeCode);
 
     List<MesProductionRecord> getPreDayReportMesProductionRecord(String organizeCode , List<MesShift> mesShiftList, String  workCenterCode);
 

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

@@ -0,0 +1,66 @@
+import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack
+import cn.estsh.i3plus.pojo.mes.bean.MesCrossOrganizeCfg
+import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper
+import cn.estsh.i3plus.pojo.mes.repository.IMesCrossOrganizeCfgRepository
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
+import org.springframework.util.CollectionUtils
+
+import javax.annotation.Resource
+
+/**
+ * @Description : 跨工厂防错
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/7/22 11:03
+ * @Modify:
+ * */
+class MesToPiscesProductSn {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(MesToPiscesProductSn.class)
+
+    @Autowired
+    private IMesCrossOrganizeCfgRepository mesCrossOrganizeCfgRepository;
+
+    @Resource(name = "mesDataSource")
+    private DynamicDataSourceProxy mesDataSource;
+
+    def readData(MesInterfaceDataMapper mapper) throws Exception {
+        String organizeCode = mapper.getOrganizeCode();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.CROSS_ORGANIZE_CFG_TYPE.REVERSE_SYNC.getValue(), "type", packBean)
+        List<MesCrossOrganizeCfg> crossOrganizeCfgList = mesCrossOrganizeCfgRepository.findByHqlWhere(packBean);
+        if (CollectionUtils.isEmpty(crossOrganizeCfgList)) {
+            LOGGER.info("未查询到跨工厂配置");
+            return new ArrayList<>();
+        }
+        List<Map<String, Object>> srcData = new ArrayList<>();
+        //循环处理数据
+        for (MesCrossOrganizeCfg crossOrganizeCfg : crossOrganizeCfgList) {
+            Map<String, Object> params = new HashMap<>();
+            params.put("srcOrganizeCode", crossOrganizeCfg.getOrganizeCode())
+            params.put("partNo", crossOrganizeCfg.getPartNo())
+            String sql = "select * from " + mapper.getSrcTableName() + " where organize_code = :srcOrganizeCode and part_no = :partNo and " + mapper.getSrcWhere() + " order by " + mapper.getSrcOrderBy() + " limit " + mapper.getSrcGetLimit()
+            //查询待同步的数据
+            List<Map<String, Object>> dataList = queryDataTable(sql, params);
+            if (!CollectionUtils.isEmpty(dataList)) {
+                //目标工厂
+                for (Map<String, Object> rowMap : dataList) {
+                    rowMap.put("DEST_ORGANIZE_CODE", crossOrganizeCfg.getSrcOrganizeCode())
+                }
+                srcData.addAll(dataList);
+            }
+        }
+        return srcData;
+    }
+
+    private List<Map<String, Object>> queryDataTable(String sql, Map<String, Object> params) {
+        NamedParameterJdbcTemplate namedJdbcTemplate = new NamedParameterJdbcTemplate(mesDataSource.getDataSource())
+        return namedJdbcTemplate.queryForList(sql, params);
+    }
+}

modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesProductSn.groovy

@@ -1,8 +1,10 @@
 import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack
 import cn.estsh.i3plus.pojo.mes.bean.MesCrossOrganizeCfg
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper
 import cn.estsh.i3plus.pojo.mes.repository.IMesCrossOrganizeCfgRepository
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -30,7 +32,9 @@ class PiscesToMesProductSn {
 
     def readData(MesInterfaceDataMapper mapper) throws Exception {
         String organizeCode = mapper.getOrganizeCode();
-        List<MesCrossOrganizeCfg> crossOrganizeCfgList = mesCrossOrganizeCfgRepository.findByHqlWhere(DdlPackBean.getDdlPackBean(organizeCode));
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.CROSS_ORGANIZE_CFG_TYPE.SYNC.getValue(),"type",packBean)
+        List<MesCrossOrganizeCfg> crossOrganizeCfgList = mesCrossOrganizeCfgRepository.findByHqlWhere(packBean);
         if (CollectionUtils.isEmpty(crossOrganizeCfgList)) {
             LOGGER.info("未查询到跨工厂配置");
             return new ArrayList<>();

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

@@ -185,11 +185,11 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
 
     @PutMapping(value = "/reopen")
     @ApiOperation(value = "重新打开")
-    public ResultBean doReopen(String[] ids) {
+    public ResultBean doReopen(Long[] ids) {
         try {
             ValidatorBean.checkNotNull(ids);
             mesWorkOrderService.doReopen(ids, AuthUtil.getSessionUser().getUserName(),AuthUtil.getOrganizeCode());
-            return ResultBean.success("反向冲销成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            return ResultBean.success("重新打开成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {

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

@@ -12,8 +12,9 @@ import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesCcscRule;
-import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.bean.MesCcscTask;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import cn.estsh.i3plus.pojo.mes.repository.MesCcscRuleRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesCcscTaskRepository;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -66,6 +67,7 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
         //查ccsc规则表
         LOGGER.info("-------- doCcscTaskByMesWorkOrder---{}", organizeCode);
         DdlPackBean ddlPackBeanRule = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getInPackList(mesWorkOrderList.stream().map(MesWorkOrder::getPartNo).collect(Collectors.toList()), "partNo",ddlPackBeanRule);
         List<MesCcscRule> ccscRuleList = ccscRuleRDao.findByHqlWhere(ddlPackBeanRule);
         Map<String, List<MesCcscRule>> ccscRulePartMap = ccscRuleList.stream().collect(Collectors.groupingBy(MesCcscRule::getPartNo));
         Map<String, List<MesWorkOrder>> workOrderPartMap = mesWorkOrderList.stream().collect(Collectors.groupingBy(MesWorkOrder::getPartNo));
@@ -160,4 +162,50 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
             }
         }
     }
+
+    @Override
+    public void insertMesCcscTask(String organizeCode, List<MesWorkOrder> mesWorkOrderList) {
+        if (CollectionUtils.isEmpty(mesWorkOrderList)) return;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getInPackList(mesWorkOrderList.stream().map(MesWorkOrder::getPartNo).collect(Collectors.toList()), "partNo", packBean);
+        List<MesCcscRule> ccscRuleList = ccscRuleRDao.findByHqlWhere(packBean);
+        if (CollectionUtils.isEmpty(ccscRuleList)) return;
+        Map<String, List<MesCcscRule>> ccscRulePartMap = ccscRuleList.stream().collect(Collectors.groupingBy(MesCcscRule::getPartNo));
+        //根据物料对工单表分组
+        Map<String, List<MesWorkOrder>> workOrderPartMap = mesWorkOrderList.stream().collect(Collectors.groupingBy(MesWorkOrder::getPartNo));
+        for (Map.Entry<String, List<MesWorkOrder>> stringListEntry : workOrderPartMap.entrySet()) {
+            List<MesWorkOrder> mesWorkOrders = stringListEntry.getValue();
+            MesWorkOrder mesWorkOrder = mesWorkOrders.iterator().next();
+            if (CollectionUtils.isEmpty(ccscRulePartMap.get(mesWorkOrder.getPartNo()))) continue;
+            MesCcscRule ccscRule = ccscRulePartMap.get(mesWorkOrder.getPartNo()).iterator().next();
+            for (MesWorkOrder workOrder : mesWorkOrders) {
+                saveCcscTask(organizeCode, workOrder, ccscRule);
+            }
+        }
+    }
+
+    private void saveCcscTask(String organizeCode, MesWorkOrder workOrder, MesCcscRule ccscRule) {
+        String orderNo = "1_" + workOrder.getWorkOrderNo();
+        int ccscRuleQty = 1;
+        //新增质量检验任务 MesCcscTask
+        MesCcscTask mesCcscTask = getMesCcscTask(organizeCode, workOrder);
+        if (!Objects.isNull(mesCcscTask)) {
+            ccscRuleQty = mesCcscTask.getQty().intValue();
+            if (mesCcscTask.getTaskNo().startsWith(MesCommonConstant.CCSC_RETEST_NO.substring(0,6))) {
+                String[] split = mesCcscTask.getTaskNo().split("_");
+                orderNo = (Integer.parseInt(split[1]) + 1)+ "_" + split[2];
+            } else {
+                orderNo = "1_" + mesCcscTask.getTaskNo();
+            }
+        }
+        insert(workOrder, ccscRule.getTestType(), String.format(MesCommonConstant.CCSC_RETEST_NO, orderNo), ccscRule.getFrequency(), ccscRule.getRule(), ccscRuleQty);
+    }
+
+    private MesCcscTask getMesCcscTask(String organizeCode, MesWorkOrder mesWorkOrder) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkOrderNo(), "workOrderNo", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", ddlPackBean);
+        DdlPreparedPack.getOrderBy(null, null, ddlPackBean);
+        return baseRDao.getByProperty(ddlPackBean);
+    }
 }

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

@@ -1057,7 +1057,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     }
 
     @Override
-    public void doReopen(String[] ids,String userName,String organizeCode) {
+    public void doReopen(Long[] ids,String userName,String organizeCode) {
         //获取工单信息
         List<MesWorkOrder> mesWorkOrderList = getMesWorkOrderList(ids, organizeCode);
         //数据更新
@@ -1076,11 +1076,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             mesWorkOrder.setCcscStatus("");
             updateMesWorkOrder(mesWorkOrder,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.UPDATE,mesWorkOrder.getQty());
         }
+        //重新生成CCSC task
+        mesCcscTaskService.insertMesCcscTask(organizeCode,mesWorkOrderList);
     }
 
-    private List<MesWorkOrder> getMesWorkOrderList(String[] ids, String organizeCode) {
+    private List<MesWorkOrder> getMesWorkOrderList(Long[] ids, String organizeCode) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getInPack(String.join(",", ids),"id",packBean);
+        DdlPreparedPack.getInPackArray(ids,"id",packBean);
         List<MesWorkOrder> mesWorkOrderList = baseRDao.findByHqlWhere(packBean);
         if (CollectionUtils.isEmpty(mesWorkOrderList)) {
             MesException.throwMesBusiException("选择工单信息不存在");

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java

@@ -38,6 +38,7 @@ public class MesCommonConstant {
 
     //CCSC生成任务号
     public static final String CCSC_TASK_NO = "CCSC_TASK_NO";
+    public static final String CCSC_RETEST_NO = "RETEST_%s";
 
     //OBS
     public static final String OBS_AK = "TPNXQ2LUMRHNYYOBO8QO";