From 6fe792f75b2b6c6420ba605ab44a89b55e617605 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Nov 2020 11:51:15 +0800 Subject: [PATCH 1/5] =?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 2/5] 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 3/5] =?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 4/5] =?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 5/5] =?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; + +}