From 9218ca44a79a79078df01f312935a9535e0fd84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 23 Jun 2020 16:08:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1?= =?UTF-8?q?lotNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 09296ef..c1296dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -144,6 +144,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("客户标签模板") private String custLabelTemplate; + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") From aaaa591be41050fa6ef1326512478def2f8ca024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 24 Jun 2020 11:31:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index a2cd693..85e63bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -138,6 +138,14 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryName; + @Transient + @ApiParam("字符长度") + private Integer length; + + @Transient + @ApiParam("校验内容") + private String checkContent; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From e3a86fdbab2dcf842ccc307bc72464e32183913a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 24 Jun 2020 19:14:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=81=E6=B6=82=E8=A3=85=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 0539818..59975a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -357,6 +357,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } + if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + } + // 时间段查询 if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( From 6f454c95a4a4595bb6d1ebb393e337ee21ac707e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 24 Jun 2020 19:54:49 +0800 Subject: [PATCH 4/4] Start Task #2212,2205 Cost:8h Left:16h --- .../estsh/i3plus/pojo/mes/model/ProdPackModel.java | 30 ++++++++++++++++------ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index f4a4de9..63903d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 涂装工单条码-展示组件(产品包装)model * @Reference : @@ -13,35 +15,47 @@ import lombok.Data; **/ @Data @Api("产品包装model") -public class ProdPackModel { +public class ProdPackModel implements Serializable { // 产品条码表--产品条码 @ApiParam("产品条码") - private String productSn; + public String productSn; // 包装主表--包装编号 @ApiParam("一检箱条码") - private String packageNo; + public String packageNo; // 包装明细表--创建时间 @ApiParam("一检校验时间") - private String createDatetime; + public String createDatetime; // 包装主表--打印状态(10：未打印 20：已打印) @ApiParam("箱条码状态") - private Integer printStatus; + public Integer printStatus; // 涂装客户标签打印 @ApiParam("客户标签") - private String custSn; + public String custSn; // 涂装客户标签打印 @ApiParam("当前工序") - private String processCode; + public String processCode; // 涂装客户标签打印 @ApiParam("更新时间") - private String modifyDateTime; + public String modifyDateTime; + + @ApiParam("工单号") + public String workOrderNo; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("物料号") + public String parentPartNo; + + public ProdPackModel() { + } public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { this.productSn = productSn; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 59975a8..60c7e68 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -640,7 +640,9 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder(