From bdf8e0d78210d06acf194d8131a164455a5be4ae Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 27 Nov 2020 18:13:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=94=99=E8=AF=AFpojo=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java index aede8be..cd07cd9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java @@ -27,7 +27,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_MODULE") -@Api("作业程序组件参数") +@Api("工作单元组件配置") public class MesWorkCellModule extends BaseBean implements Serializable { private static final long serialVersionUID = -3537487776977917751L; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java index de64920..921c2bf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description : Wms实体字段Model信息 + * @Description : mes实体字段Model信息 * @Reference : * @Author : siliter.yuan * @CreateDate : 2020-04-24 09:53 From ad0325f7df980c28e99474002a5e15379540641e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Nov 2020 19:22:39 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index d5df633..dc69e01 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -25,9 +25,16 @@ public class WmsStockFifoModel { @ApiParam(value = "物料集合") List partNos; + @ApiParam(value = "物料") + String partNo; + @ApiParam(value = "存储区集合") List zoneNos; + @ApiParam(value = "存储区") + String zoneNo; + + @ApiParam(value = "物料对应的存储区") Map partToZoneMap; From 970f75f8cf29495b078df56fcd6bf71671c46a83 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 27 Nov 2020 20:36:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=BB=84=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6f6b2bb..5838d4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("工作中心") private String workCenterCode; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + private String groupNo; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index ef5f899..5807d66 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -79,6 +79,9 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("工位名称") private String workCellName; + @ApiParam("工位描述") + private String workCellDesc; + @ApiParam("x坐标内容") private List xAxisList; From 7be62a939bf59c47c033f92e7b1cf0974663626a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Nov 2020 09:23:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?TJ=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 116caa0..4308bde 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -28,6 +28,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_ORDER", indexes = { @Index(columnList = "ORDER_NO"), + @Index(columnList = "AREA_CODE"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WO_STATUS") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index c77b789..2eca8bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -43,6 +43,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("不合格数量") private Double noQuQty; + @ApiParam("待定数量") + private Double determindQty; + @ApiParam("一次合格率") private String firstPassRate; From 19636e308e381bc31beeae7cf0df96fc5cb6a4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 30 Nov 2020 11:35:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=9012645=2019048-=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E8=A1=A8=E7=94=A8=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E5=B7=A5=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94-20201123=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ea3844d..ff25483 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -169,12 +169,13 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.qcStatus = qcStatus; } - public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) { + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) { this.workCenterCode = workCenterCode; this.partNo = partNo; this.partName = partName; this.packageNo = packageNo; this.qty = qty; this.createDatetime = createDatetime; + this.workOrderNo = workOrderNo; } } From 4a38aab5b6705c61882799f662b39a4df6762a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 30 Nov 2020 13:13:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2989?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index eac12a1..1d45817 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -154,6 +154,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("备注") private String remark; + @Column(name = "REMARK1") + @ApiParam("备注1") + private String remark1; + + @Column(name = "REMARK2") + @ApiParam("备注2") + private String remark2; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index c414b10..7d9a8fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -179,6 +179,13 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("备注1") + private String remark1; + + @Transient + @ApiParam("备注2") + private String remark2; public WmsPoSn(){} From ca18bb40cd4497d3bd5f8c34c3cd277350d9cb2f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 30 Nov 2020 14:18:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=9D=A1=E7=A0=81=EF=BC=9A=E5=8D=95=E6=8D=AE=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=A2=9E=E5=8A=A0=E8=A1=8C=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d549c1f..c5215d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2030,8 +2030,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result); + if (!StringUtil.isEmpty(wmsDocMovementSn.getItem())) { + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); @@ -2039,6 +2040,7 @@ public class WmsHqlPack { return result; } + /** * 移库单订单条码表 分页查询 *