From a7c3167eef1ff6401e6e5f9ec6eae6e0a5589148 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 17 Aug 2020 20:07:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E4=B8=8A=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 12e6ad0..671b482 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -40,4 +40,24 @@ public class MesContainer extends BaseBean { @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; + + @Column(name = "IP_ADDRESS") + @ApiParam(value = "IP") + private String ipAddress; + + @Column(name = "PORT") + @ApiParam(value = "端口") + private String port; + + @Column(name = "UNLOCK_DO") + @ApiParam(value = "接收DO") + private String unlockDo; + + @Column(name = "RED_LIGHT_DO") + @ApiParam(value = "红灯DO") + private String redLightDo; + + @Column(name = "TIME_SECOND") + @ApiParam(value = "处理时间(秒)") + private String timeSecond; } From 4d816de5da921800247d4f6864a7229ff7fe0131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 18 Aug 2020 12:59:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98,=E6=B7=BB=E5=8A=A0PTL=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=85=B3=E8=81=94bug:10538?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 1144a04..a95f2be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -173,4 +173,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "IS_CHECK") @ApiParam("是否复核校验") private Integer isCheck; + + @Column(name = "PICK_QTY") + @ApiParam("拣货数量") + private Integer pickQty; } From 5bfd54240266cfa0777ddf3a02589136b46afc5b Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 18 Aug 2020 13:01:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=8B=89=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1d991da..203174c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4768,7 +4768,8 @@ public class WmsEnumUtil { LINE_PULL(30, "巡线拉动"), PLANNED_PULL(40, "计划拉动"), ANDON_PULL(50, "安灯拉动"), - EXTERNAL_PULL(60, "手工拉动"); + EXTERNAL_PULL(60, "手工拉动"), + WORKORDER_PULL(70, "工单拉动"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index 04436ff..48df648 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -52,6 +52,11 @@ public class MesPpDetails extends BaseBean{ @ApiParam(value = "工单数量", example = "0") public Double qty; + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "处理数量", example = "0") + public Double transQty = 0D; + @Column(name="PART_GROUP_NO") @ApiParam("零件组号") public String partGroupNo; From 72afe6891bd4f3da00e4b6efeac542ec1dccaad6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 18 Aug 2020 15:57:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=99=E7=AE=B1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index c835f5d..1b57111 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -58,4 +58,7 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; + + @ApiParam("工作中心名称") + private String workCenterName; } From 6db85d596b0d4f51d63a77a6efbcc53aa69021d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 18 Aug 2020 16:53:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index d73253f..7ee2845 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -84,6 +84,9 @@ public class ProductInfoManageModel { @ApiParam("主队列编号") private String orderNo; + @ApiParam("校验VIN") + private String checkVinCode; + @ApiParam("总队列类型") private List queueTypeList;