From 6fe792f75b2b6c6420ba605ab44a89b55e617605 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Nov 2020 11:51:15 +0800 Subject: [PATCH 01/17] =?UTF-8?q?posn=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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 1d731cd..081c0bb 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 @@ -869,7 +869,8 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), - COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"); + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), + SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR private int value; private String code; 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 d3ba94f..c414b10 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; +// @Column(name = "DATE_CODE", nullable = false) +// @ApiParam(value = "供应商生产批次") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) +// public String dateCode = ""; + @ApiParam(value = "供应商名称") @Transient public String vendorNameRdd; @@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean { @Transient public String lotNo; - @Transient - @ApiParam(value = "生产日期") + @Column(name = "DATE_CODE", nullable = false) + @ApiParam(value = "供应商生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode; @Transient From 2d47eeb84d2e6f543aeca613dea7713b53f100f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 24 Nov 2020 15:17:18 +0800 Subject: [PATCH 02/17] BUG#12487 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 3fd7418..1cfd31a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -268,8 +268,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", this.z = z; } - public WmsLocate(Integer boxQty , Double partQty,String locateNo){ - this.boxQty=boxQty; + public WmsLocate(Long boxQty , Double partQty,String locateNo){ + this.boxQty=boxQty.intValue(); this.partQty=partQty; this.locateNo=locateNo; } From 70f659593b973603c95748fea809c2ce2efc8002 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 24 Nov 2020 20:47:22 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20cron=20=E8=A1=A8=E8=BE=BE=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index d9b5dd4..c5fccfa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -124,6 +124,17 @@ public class WmsInterfaceDataMapper extends BaseBean { public Integer syncFrequency; /** + * 同步时间 CRON 表达式 + */ + @Column(name = "SYNC_CRON") + public String syncCron; + /** + * 下次同步时间，与 syncCron 属性同时使用 + */ + @Column(name = "NEXT_SYNC_TIME") + public String nextSyncTime; + + /** * 上次同步时间 */ @Column(name = "LAST_SYNC_TIME") From 21cfe5c74083f7f3d852f651536e08d799114f76 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Nov 2020 00:38:46 +0800 Subject: [PATCH 04/17] =?UTF-8?q?Fix=20bug#12004=2019058-KT=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=87=BA=E5=BA=93=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) 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 d8f8ada..4639099 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 @@ -215,6 +215,23 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "原因", example = "1") public String reason; + @Column(name = "RECEIVE_DATE") + @ApiParam(value = "收货日期") + public String receiveDate; + + @Column(name = "RECEIVE_TIME") + @ApiParam(value = "收货时间") + public String receiveTime; + + @Column(name = "WINDOW_START_TIME") + @ApiParam(value = "窗口开始时间") + public String windowStartTime; + + @Column(name = "WINDOW_END_TIME") + @ApiParam(value = "窗口结束时间") + public String windowEndTime; + + @Transient @ApiParam("周总数") private Integer weekRcCount; @@ -227,6 +244,18 @@ public class WmsPOMaster extends BaseBean { @ApiParam("当前状态") private String nowStatus; + @ApiParam(value = "延迟次数") + private Long delayCount; + + @ApiParam(value = "延迟次数") + private Long sumDelayCount; + + @ApiParam("计划交货时间") + private String planPlanDateTime; + + + + public WmsPOMaster() { @@ -264,6 +293,23 @@ public class WmsPOMaster extends BaseBean { this.delayHour = delayHour; } + public WmsPOMaster(String vendorNo, Long delayCount) { + this.vendorNo = vendorNo; + this.delayCount = delayCount; + } + + public WmsPOMaster(String orderNo, String reason, String planDate, String planTime, + String receiveTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.reason = reason; + this.planDate = planDate; + this.planTime = planTime; + this.receiveTime = receiveTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } From cf9d3d9f2dbbcfd959ad5725fd9e99d1c38948cd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 25 Nov 2020 04:47:05 +0800 Subject: [PATCH 05/17] =?UTF-8?q?tz=20=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesShiftRestModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java new file mode 100644 index 0000000..dd422cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesShiftRestModel extends MesShiftRest { + + @ApiParam("开始时间") + private String startDate; + + @ApiParam("结束时间") + private String endDate; + + @ApiParam("实际时间差(毫秒)") + private Long subTimes; + +} From 3ebcfd21e71fab9a3fcb1f7f6560ebf25a5a331c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 25 Nov 2020 11:26:06 +0800 Subject: [PATCH 06/17] BUG#12711,12509 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 879e3d2..9ccaf61 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,6 +2030,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); From a604e70771bde74794dc67d8cda0ad8ebf5be20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 25 Nov 2020 11:41:39 +0800 Subject: [PATCH 07/17] BUG#12711 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9ccaf61..d7adefb 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,7 +2030,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); From c679e7f19befc9bec11cfef88567ac51f9adee30 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 25 Nov 2020 11:45:00 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 e803e6c..96ee98a 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 @@ -67,6 +67,12 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("时段") private String timeInterval; + @ApiParam("温度") + private String temperature; + + @ApiParam("湿度") + private String humidity; + @ApiParam("x坐标内容") private List xAxisList; 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 9f50d9d..bcde4c8 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 @@ -2491,7 +2491,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); } if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) { - DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean); + DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean); } if (queueJitActual.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); From 36130d12f2132c118ba4ccb8e1081a1e92425479 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Nov 2020 11:47:16 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E9=80=80=E8=B4=A7=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 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 081c0bb..14d440e 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 @@ -870,7 +870,7 @@ public class WmsEnumUtil { OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), - SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR + SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR private int value; private String code; From fa3bb1f53a37f55c5053d9fa2523727e688e4043 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 25 Nov 2020 14:42:10 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=B6=82=E8=A3=85=20=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 1d95ab2..4852d46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -38,6 +38,9 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; + @ApiParam("当前数据标识") + private boolean currentInfo; + @ApiParam("呼叫异常数量") private Integer exceptQty; From 6ffec48185e4c5315435ed6b1369c283215c6e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 25 Nov 2020 16:46:26 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E3=80=902977=2011=202.5.5=20=E6=95=B4?= =?UTF-8?q?=E5=BD=A2=E4=B8=9A=E5=8A=A1=EF=BC=8C=E5=8D=95=E4=BB=B6=E7=BF=BB?= =?UTF-8?q?=E5=8C=85=E4=B8=8E=E6=95=B4=E7=AE=B1=E8=BF=87=E7=AB=99=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/MesPackage.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 3 +++ .../estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) 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 fc5e470..ad0869f 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 @@ -185,6 +185,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户名称") private String custName; + @Transient + @ApiParam("汇总数量") + private Integer gatherQty = 0; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 7cbd75b..94dacc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -91,6 +91,9 @@ public class GenSerialNoModel { @ApiParam("客户工厂代码") private String custProdLineCode; + @ApiParam("工序代码") + private String processCode; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java index ad4b799..982b340 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java @@ -45,10 +45,14 @@ public class MgnPackageSnTraceReportModel { @ApiParam(value = "修改日期查询用，查询结束日期") public String createDateTimeEnd; + + @ApiParam(value = "工单号") + public String workOrderNo; + public MgnPackageSnTraceReportModel() { } - public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) { + public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName, String workOrderNo) { this.packageNo = packageNo; this.packageNo2 = packageNo2; this.serialNumber = serialNumber; @@ -58,5 +62,7 @@ public class MgnPackageSnTraceReportModel { this.createDatetime = createDatetime; this.workCenterCode = workCenterCode; this.workCenterName = workCenterName; + this.workOrderNo = workOrderNo; + } } From ee37d6f5eba9f147595f48b48eb837349efacb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 25 Nov 2020 18:31:41 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#12597?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsVendorDock.java | 47 ++++++++++++++++++++++ .../wms/repository/WmsVendorDockRepository.java | 17 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++ 3 files changed, 70 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java new file mode 100644 index 0000000..e438613 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +/** + * @Description 供应商道口信息 + * @Reference + * @Author dragon + * @CreateDate 2020/11/25 13:43 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_VENDOR_DOCK") +@Api("供应商道口信息") +public class WmsVendorDock extends BaseBean { + private static final long serialVersionUID = 662346332597842770L; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorNo; + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="DOCK_ADDRESS") + @ApiParam("道口发运地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String dockAddress; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java new file mode 100644 index 0000000..9a10063 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorDock; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description 供应商道口DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/11/25 14:43 + * @Modify + */ +@Repository +public interface WmsVendorDockRepository extends BaseRepository { +} 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 d7adefb..d549c1f 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 @@ -3553,4 +3553,10 @@ public class WmsHqlPack { return result; } + public static DdlPackBean packHqlWmsDock(WmsDock wmsDock) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringRightLikerPack(wmsDock.getDockCode(), "dockCode", result); + getStringBuilderPack(wmsDock, result); + return result; + } } From 2f56f8949e848892de5ea5098ef932a5ae149164 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 25 Nov 2020 21:02:29 +0800 Subject: [PATCH 13/17] =?UTF-8?q?eol=E7=9C=8B=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 96ee98a..ef5f899 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 @@ -73,6 +73,12 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("湿度") private String humidity; + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + @ApiParam("x坐标内容") private List xAxisList; From 9b70e3c7bf82a3c051721e3424b7567da6d9c98e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Nov 2020 10:43:54 +0800 Subject: [PATCH 14/17] =?UTF-8?q?fifo=20=E6=8E=A8=E8=8D=90=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ 1 file changed, 3 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 70f38db..d5df633 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 @@ -49,6 +49,9 @@ public class WmsStockFifoModel { @ApiParam("FIFO查询获取方式") private Integer fifoSnByLood; + @ApiParam("过滤FIFO锁定条码") + private Integer filterFifoLockSn; + @ApiParam("物料条码信息") Map> snMap = new HashMap<>(); From c1e3b01524537370d6db1345390e896bee40ad14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Nov 2020 14:55:39 +0800 Subject: [PATCH 15/17] BUG#12504 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 4639099..00f26d8 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 @@ -250,6 +250,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "延迟次数") private Long sumDelayCount; + @ApiParam(value = "延迟到货百分比") + private String delayPercent; + @ApiParam("计划交货时间") private String planPlanDateTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index d2bd144..b719cdd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -36,7 +36,7 @@ public class WmsVendorDelayMasterModel extends BaseBean { private Long sumDelayCount; @ApiParam(value = "延迟到货百分比") - private Double delayPercent; + private String delayPercent; @ApiParam(value = "查询开始时间") private String startDateTime; @@ -85,4 +85,5 @@ public class WmsVendorDelayMasterModel extends BaseBean { public WmsVendorDelayMasterModel() { } + } From 787629581f4211ce7f1297e40330cf1cf17c719d Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 15:11:03 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E6=96=B9=E5=90=91=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0SWEB2SAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 6e210ce..34dbb05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); @@ -61,6 +62,7 @@ public class WmsInterfaceEnumUtil { /** * -1 不在范围内 + * * @param desc * @return */ From 802d5d2320f186003bf52c3439d7cd3f18633205 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 15:11:55 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 73c18c8..329db54 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") private String expectedTimeEnd; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; }