提交

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java

@@ -53,11 +53,11 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="同步时间")
     private String syncTime;
 
-    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @Column(name="SYNC_PATTERN")//2.新增  1.修改
     @ApiParam("同步方式")
     private Integer syncPattern;
 
-    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @Column(name="SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
     @ApiParam("同步类型")
     private Integer syncType;
 
@@ -66,6 +66,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
+    @Column(name="EXTRACT_GAP")
+    @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
+    private Integer extractGap;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java

@@ -66,6 +66,11 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
+
+    @Column(name="EXTRACT_GAP")
+    @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
+    private Integer extractGap;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -265,13 +265,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
-        if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
+        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
-            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
-        }
-
         return packBean;
     }
 
@@ -513,6 +508,7 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
     public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) {
         DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean);
@@ -525,6 +521,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
+
     public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean);
@@ -557,7 +554,6 @@ public class MesHqlPack {
      * 函数分页获取封装
      *
      * @param mesMethod
-     * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesMethod(MesMethod mesMethod) {
@@ -574,6 +570,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
         return packBean;
     }
+
     public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean);
@@ -1173,6 +1170,7 @@ public class MesHqlPack {
 
     /**
      * 条码生成规则校验同一机构下条码规则唯一性
+     *
      * @param numberRule
      * @param id
      * @param organizeCode