From 5cea79571b0a33e152d85e596ad0c1a2fc1850f9 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Nov 2020 10:42:47 +0800 Subject: [PATCH 1/9] =?UTF-8?q?PO=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 38 ++++++++-------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 50964f2..6575cee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -59,7 +59,7 @@ public class SwebHqlPack { } DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -81,11 +81,10 @@ public class SwebHqlPack { poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); - //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue()); DdlPreparedPack.getInPackList(poStatus, "poStatus", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -94,7 +93,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebPackage, result); } @@ -102,7 +101,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebConfig, result); } @@ -121,7 +120,7 @@ public class SwebHqlPack { HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return result.toString(); } @@ -134,7 +133,7 @@ public class SwebHqlPack { // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(model, result); } @@ -142,7 +141,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); } @@ -151,7 +150,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrderDetails, result); } @@ -159,7 +158,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(vendorRel, result); } @@ -208,22 +207,13 @@ public class SwebHqlPack { return buildHql(details, result); } -// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { -// DdlPackBean result = new DdlPackBean(); -// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); -// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); -// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); -// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); -// return buildHql(master, result); -// } - public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } @@ -242,7 +232,7 @@ public class SwebHqlPack { if (!StringUtil.isEmpty(capcity.getDateEnd())) { DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result); } - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(capcity, result); } @@ -260,7 +250,7 @@ public class SwebHqlPack { if (!StringUtil.isEmpty(alarm.getDateEnd())) { DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); } - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(alarm, result); } @@ -272,7 +262,7 @@ public class SwebHqlPack { DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(stock, result); } @@ -285,7 +275,7 @@ public class SwebHqlPack { } DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(alarm, result); } } From 6fe792f75b2b6c6420ba605ab44a89b55e617605 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Nov 2020 11:51:15 +0800 Subject: [PATCH 2/9] =?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 3/9] 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 4/9] =?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 5/9] =?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 6/9] =?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 c679e7f19befc9bec11cfef88567ac51f9adee30 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 25 Nov 2020 11:45:00 +0800 Subject: [PATCH 7/9] =?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 8/9] =?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 9/9] =?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;