自定义脚本同步

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

@@ -1,3 +1,4 @@
+import cn.estsh.i3plus.mes.apiservice.util.DateUtil
 import cn.estsh.i3plus.platform.common.tool.TimeTool
 import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean
@@ -48,6 +49,8 @@ class MesToPiscesProductSn {
             LOGGER.info("未查询到跨工厂配置");
             return new ArrayList<>();
         }
+        LOGGER.info("跨工厂配置个数{}",crossOrganizeCfgList.size());
+
         List<Map<String, Object>> srcData = new ArrayList<>();
         List<String> updateList = new ArrayList<>();
         //循环处理数据
@@ -62,15 +65,19 @@ class MesToPiscesProductSn {
             }
 
             String sql = "select * from " + mapper.getSrcTableName() + " where organize_code = :srcOrganizeCode and part_no = :partNo and create_date_time >= :createDateTime and " + mapper.getSrcWhere() + " order by " + mapper.getSrcOrderBy() + " limit " + mapper.getSrcGetLimit()
+            LOGGER.info("工厂:{}，物料:{}，时间:{}，查询sql:{}",crossOrganizeCfg.getOrganizeCode(),crossOrganizeCfg.getPartNo(),params.get("createDateTime"),sql);
             //查询待同步的数据
             List<Map<String, Object>> dataList = queryDataTable(sql, params);
             if (!CollectionUtils.isEmpty(dataList)) {
+                LOGGER.info("工厂:{}，物料:{}，查询行数:{}",crossOrganizeCfg.getSrcOrganizeCode(),crossOrganizeCfg.getPartNo(),dataList.size());
+
                 //目标工厂
                 for (Map<String, Object> rowMap : dataList) {
                     rowMap.put("DEST_ORGANIZE_CODE", crossOrganizeCfg.getSrcOrganizeCode())
                 }
                 srcData.addAll(dataList);
-                String createDateTime = dataList.iterator().next().get("create_date_time")
+
+                String createDateTime = TimeTool.pareDateToString(DateUtil.addMinutes(TimeTool.parseDate(dataList.iterator().next().get("create_date_time")), -5));
                 //更新配置
                 updateList.add("update mes_cross_organize_cfg set last_create_date_time = '"+createDateTime+"',last_exe_time = '"+ TimeTool.getNowTime(true)+"' where id= " + crossOrganizeCfg.getId() + " ;")
             }

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

@@ -39,6 +39,7 @@ class PiscesToMesProductSn {
             LOGGER.info("未查询到跨工厂配置");
             return new ArrayList<>();
         }
+        LOGGER.info("跨工厂配置个数{}",crossOrganizeCfgList.size());
         List<Map<String, Object>> srcData = new ArrayList<>();
         //循环处理数据
         for (MesCrossOrganizeCfg crossOrganizeCfg : crossOrganizeCfgList) {
@@ -46,9 +47,11 @@ class PiscesToMesProductSn {
             params.put("srcOrganizeCode", crossOrganizeCfg.getSrcOrganizeCode())
             params.put("partNo", crossOrganizeCfg.getPartNo())
             String sql = "select top "+mapper.getSrcGetLimit()+" * from " + mapper.getSrcTableName() + " where PLANT = :srcOrganizeCode and PART_NO = :partNo and " + mapper.getSrcWhere() + " order by "+mapper.getSrcOrderBy()
+            LOGGER.info("工厂:{}，物料:{}，查询sql:{}",crossOrganizeCfg.getSrcOrganizeCode(),crossOrganizeCfg.getPartNo(),sql);
             //查询待同步的数据
             List<Map<String, Object>> dataList = queryDataTable(sql, params);
             if (!CollectionUtils.isEmpty(dataList)) {
+                LOGGER.info("工厂:{}，物料:{}，查询行数:{}",crossOrganizeCfg.getSrcOrganizeCode(),crossOrganizeCfg.getPartNo(),dataList.size());
                 srcData.addAll(dataList);
             }
         }