JIS

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

@@ -25,9 +25,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_JIS_PATTERN")
+@Table(name = "MES_PATTERN_JIS")
 @Api("JIS发运模式")
-public class MesJisPattern extends BaseBean {
+public class MesPatternJis extends BaseBean {
 
     @Column(name = "PATTERN_NO")
     @ApiParam("模式编号")
@@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean {
     @ApiParam("规则")
     private String rule;
 
-    @Column(name = "DESC")
+    @Column(name = "PATTERN_DESC")
     @ApiParam("描述")
-    private String desc;
+    private String patternDesc;
 
     @Column(name = "TOP_NO")
     @ApiParam("一次显示TOP数")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesJisPattern;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesJisPatternRepository extends BaseRepository<MesJisPattern, Long> {
+public interface MesPatternJisRepository extends BaseRepository<MesPatternJis, Long> {
 }

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

@@ -25,9 +25,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_JIS_PATTERN")
+@Table(name = "MES_PATTERN_JIS")
 @Api("JIS发运模式")
-public class MesJisPattern extends BaseBean {
+public class MesPatternJis extends BaseBean {
 
     @Column(name = "PATTERN_NO")
     @ApiParam("模式编号")
@@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean {
     @ApiParam("规则")
     private String rule;
 
-    @Column(name = "DESC")
+    @Column(name = "PATTERN_DESC")
     @ApiParam("描述")
-    private String desc;
+    private String patternDesc;
 
     @Column(name = "TOP_NO")
     @ApiParam("一次显示TOP数")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern;
+import cn.estsh.i3plus.pojo.mes.bean.MesPatternJis;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesJisPatternRepository extends BaseRepository<MesJisPattern, Long> {
+public interface MesPatternJisRepository extends BaseRepository<MesPatternJis, Long> {
 }

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

@@ -2100,23 +2100,23 @@ public class MesHqlPack {
 
     /**
      * JIS发运模式
-     * @param jisPattern
+     * @param patternJis
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode);
-        if (!StringUtils.isEmpty(jisPattern.getPatternNo())) {
-            DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean);
+    public static DdlPackBean getPatternJisCondition(MesPatternJis patternJis, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(patternJis, organizeCode);
+        if (!StringUtils.isEmpty(patternJis.getPatternNo())) {
+            DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean);
         }
-        if (!StringUtils.isEmpty(jisPattern.getTopNo())) {
-            DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean);
+        if (!StringUtils.isEmpty(patternJis.getTopNo())) {
+            DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean);
         }
-        if (!StringUtils.isEmpty(jisPattern.getHandleNo())) {
-            DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean);
+        if (!StringUtils.isEmpty(patternJis.getHandleNo())) {
+            DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean);
         }
-        if (!StringUtils.isEmpty(jisPattern.getPatternType())) {
-            DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean);
+        if (!StringUtils.isEmpty(patternJis.getPatternType())) {
+            DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean);
         }
         return packBean;
     }