Merge branch 'dev' into test

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

@@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
     @ApiParam("是否封箱")
     private Integer isSealed;
 
-    @Transient
-    @ApiParam("封箱状态")
-    private String sealStatus;
-
     @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态10：未打印 20：已打印")
     private Integer printStatus;
@@ -87,6 +83,14 @@ public class MesPackage extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("封箱状态")
+    private String sealStatus;
+
+    @Transient
+    @ApiParam("客户代码")
+    private String custCode;
+
     public MesPackage() {
     }
 

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

@@ -43,6 +43,10 @@ public class MesProdPack extends BaseBean {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
+    @Column(name = "PACK_LABEL_TEMPLATE")
+    @ApiParam("包装标签模板")
+    private String packLabelTemplate;
+
     @Column(name = "PACK_LABEL_TEMPLATE2")
     @ApiParam("包装标签模板2")
     private String packLabelTemplate2;

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

@@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
     @ApiParam("是否封箱")
     private Integer isSealed;
 
-    @Transient
-    @ApiParam("封箱状态")
-    private String sealStatus;
-
     @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态10：未打印 20：已打印")
     private Integer printStatus;
@@ -87,4 +83,12 @@ public class MesPackage extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("封箱状态")
+    private String sealStatus;
+
+    @Transient
+    @ApiParam("客户代码")
+    private String custCode;
+
 }

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

@@ -43,14 +43,14 @@ public class MesProdPack extends BaseBean {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
-    @Column(name = "PACK_LABEL_TEMPLATE2")
-    @ApiParam("包装标签模板2")
-    private String packLabelTemplate2;
-
     @Column(name = "PACK_LABEL_TEMPLATE")
     @ApiParam("包装标签模板")
     private String packLabelTemplate;
 
+    @Column(name = "PACK_LABEL_TEMPLATE2")
+    @ApiParam("包装标签模板2")
+    private String packLabelTemplate2;
+
     @Column(name = "PACK_LABEL_TEMPLATE3")
     @ApiParam("包装标签模板3")
     private String packLabelTemplate3;

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

@@ -1175,8 +1175,12 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
-        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
-        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        if (!StringUtils.isEmpty(mesPcnTask.getTaskCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }