From ddf9936d749c1831af864bdc36d8658dc5703a43 Mon Sep 17 00:00:00 2001 From: liquor <1548617474@qq.com> Date: Mon, 14 Sep 2020 15:36:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=9C=A8=E7=9C=8B=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E5=88=97=E2=80=9C=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E4=BD=8D=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 0a332da..556316e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -521,7 +521,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.orderStatus = orderStatus; } - public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) { + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty,String srcLocateNo) { this.id = wmsDocMovementDetails.getId(); this.orderNo = wmsDocMovementDetails.getOrderNo(); this.partNo = wmsDocMovementDetails.getPartNo(); @@ -533,5 +533,6 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.createDatetime = wmsDocMovementDetails.getCreateDatetime(); this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); this.boxQty = boxQty; + this.srcLocateNo = srcLocateNo; } } From 92c2a49b907dee7941e9db89ea024d0256301ab1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 14 Sep 2020 21:31:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f50dd20..c9af9a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -832,5 +832,19 @@ public class WmsStockSn extends BaseBean { this.fixLotNo = fixLotNo; } + public WmsStockSn(String sn, Double qty, String unit, String partNo, String partNameRdd, String partTypeDesc, String lotNo, String leftCode, String fixLotNo, String vendorNo, String organizeCode) { + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partTypeDesc = partTypeDesc; + this.lotNo = lotNo; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.organizeCode = organizeCode; + } + } From 3267a9b54ff83db5aa1adf0af278a3b3a99a49fb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 15 Sep 2020 09:37:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E5=A6=82=E4=B8=9CAGV=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 3 ++ .../i3plus/pojo/wms/modelbean/WmsAgvModel.java | 47 ---------------------- 2 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index a941bf2..341533f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -53,6 +53,9 @@ public class WmsConfig extends BaseBean { @ApiParam(value ="参数值类型") private String configValueType; + /** + * SQL Server 2005:请使用 varchar(max)、nvarchar(max) 和 varbinary(max) 数据类型，而不要使用 text、ntext 和 image 数据类型。 + */ @Lob @Column(name="CONFIG_VALUE", columnDefinition = "TEXT") @ApiParam(value ="参数值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java deleted file mode 100644 index 9a2ae7e..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description : AGV接口Model - * @Reference : - * @Author : jimmy.zeng - * @CreateDate : 2020-09-10 20:21 - * @Modify: - **/ -@Data -@Api("AGV接口Model") -public class WmsAgvModel { - - @ApiParam(value = "任务ID") - private String taskId; - - @ApiParam(value = "源库位") - private String srcLocateNo; - - @ApiParam(value = "目标库位") - private String destLocateNo; - - @ApiParam(value = "物料编号") - private String partNo; - - @ApiParam(value = "物料名称") - private String partName; - - @ApiParam(value = "需求数量") - private Double qty; - - @ApiParam(value = "工厂代码") - private String organizeCode; - - @ApiParam(value = "物料编号集合") - private List partNoList; - - @ApiParam(value = "目标库位编号集合") - private List destLocateNoList; - -} From e75745380ebe60326d6eb9c5179be9ff68f0213b Mon Sep 17 00:00:00 2001 From: liquor <1548617474@qq.com> Date: Tue, 15 Sep 2020 11:44:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=9011324=2020011--=E5=8C=97=E7=BE=8E?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0=E6=97=B6?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5=E4=B8=BA2020-09-11?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=90=8E=E5=8F=B0=E5=9C=A8=E4=BC=A0?= =?UTF-8?q?=E7=BB=99=E5=89=8D=E7=AB=AF=E6=97=B6=E5=B0=86=E5=90=8E=E4=B8=89?= =?UTF-8?q?=E4=BD=8D=E5=AD=97=E7=AC=A6=E5=8E=BB=E9=99=A4=EF=BC=8C=E5=8F=98?= =?UTF-8?q?=E4=B8=BA2020-09=E7=94=A8=E4=BA=8E=E5=AE=A2=E6=88=B7=E7=9B=AE?= =?UTF-8?q?=E8=A7=86=E5=8C=96-0914=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/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c9af9a4..f9b3812 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -237,6 +237,10 @@ public class WmsStockSn extends BaseBean { @Transient public String zoneNameRdd; + @ApiParam(value = "时间") + @Transient + public String date; + @ApiParam(value = "库位名称") @Transient public String locateNameRdd; From 6e22be2d3792331a6a03f66b933d9d2a6e3315b5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 15 Sep 2020 12:06:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 11 +++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 9ba02c1..2ad5530 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -83,6 +83,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String[] zoneNos; + @Transient + @ApiParam("库存地代码") + @AnnoOutputColumn(hidden = true) + public String areaNo; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -91,4 +96,10 @@ public class WmsCSRange extends BaseBean { this.partNameRdd = partNameRdd; } + public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) { + this.zoneNo = zoneNo; + this.areaNo = areaNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 8c80c2a..ee49f3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -203,6 +203,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("周总数") private Integer weekRcCount; + @Transient + @ApiParam("容差") + private Integer delayHour; + public WmsPOMaster() { @@ -229,7 +233,7 @@ public class WmsPOMaster extends BaseBean { } public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, - String dockCode, String planDate, String planTime) { + String dockCode, String planDate, String planTime, Integer delayHour) { this.orderNo = orderNo; this.poStatus = poStatus; this.vendorNo = vendorNo; @@ -237,6 +241,7 @@ public class WmsPOMaster extends BaseBean { this.dock = dockCode; this.planDate = planDate; this.planTime = planTime; + this.delayHour = delayHour; } public int getPoStatusVal() { 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 6133593..d97792c 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 @@ -133,6 +133,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "DELAY_HOUR", columnDefinition = "int default 0") + @ApiParam(value = "容差") + private Integer delayHour; + @Column(name = "REMARK") @ApiParam("备注") private String remark; From 6fa35ad939b597edfd32a8ab35a5f1c8ef27ef0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 15 Sep 2020 13:29:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=8F=96=E6=B6=88=E6=9D=A1=E7=A0=81=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 28ed12b..9c495fe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -58,19 +58,21 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"), - PCS_BACK_MODULE(50, "工序后台组件"), - PLC_CALLBACK_MODULE(60, "PLC回调工位参数"), - ASSIST_MODULE(70, "辅助组件"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -78,6 +80,8 @@ public class MesPcnEnumUtil { return value; } + public String getData() { return data; } + public String getDescription() { return description; }