From ebb59cbb647cf9055e5e0af97965d06ecf6d23b9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 13 Nov 2019 18:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82:1167,=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=89=93=E5=8C=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 12 ++++++++---- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 12 ++++++++---- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++-- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 6c4e5d3..2f6d04b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/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() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java index 5f3fc77..18efe0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ b/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 3314cf6..6d4f2f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/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; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 50b9ecf..f8808b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index d3489e6..bc3eab8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/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; }