From 346a5088ffd4bf2cefeab46f392e685b3847cf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Nov 2020 18:04:00 +0800 Subject: [PATCH 01/14] BUG#12231 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 542301e..6def198 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -16,6 +16,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; import java.util.List; +import java.util.Map; /** * @Description : 库存信息 @@ -169,6 +170,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "应有数量") private Double theoryQty; + @Transient + @ApiParam(value = "差异数量MAP") + private Map> differenceQtyMap; + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; @@ -362,4 +367,11 @@ public class WmsStockQuan extends BaseBean { this.partNameRdd = partNameRdd; this.qty = qty; } + public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } From 48c1d2c1c83924f22e3206d00cdba61512eb422d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 4 Nov 2020 21:26:08 +0800 Subject: [PATCH 02/14] =?UTF-8?q?feat(tj)=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 04a5b7f..70ebd4e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1961,8 +1961,10 @@ public class CommonEnumUtil { return null; } + + // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest private String getJDBCUrlMySQL(String database,String host,Integer port){ - //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST + // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST return "jdbc:mysql://"+host+":"+port+"/"+database+ "?autoReconnect=true" + "&useSSL=false" + From e775db87fad77b4704944007052dcc7dba14c88c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Nov 2020 21:27:06 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E6=8F=92=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 2286808..116caa0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -84,7 +84,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "IS_PULL") @ApiParam("是否投料") - private Integer isPull = 2; + private Integer isPull = 1; @Column(name = "WO_TYPE") @ApiParam("工单类型") From 0be2231995341db4f1d31c60354b501a35bdb0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Nov 2020 10:18:14 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E3=80=9012238=2019073-=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8-=E9=80=9A=E7=9F=A5=E8=AE=B0=E5=BD=95-?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=A4=B1=E6=95=88=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/andon/sqlpack/AndonHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 9038150..0a111a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -51,6 +51,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); From 85d2f03b55b776739b8d4390f66b34f08c070bd5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 5 Nov 2020 10:44:22 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++++- 1 file changed, 47 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 1d94a09..b70f563 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 @@ -867,7 +867,8 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), - OTHER_OUT(740, "OTHER_OUT", "其它出库"); + OTHER_OUT(740, "OTHER_OUT", "其它出库"), + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"); private int value; private String code; @@ -9290,6 +9291,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * WMS数据库类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_DB_TYPE { + MYSQL(10, "mysql", "mysql"), + SQLSERVER(20, "sqlserver", "sqlserver"); + + private int value; + private String code; + private String description; + + WMS_DB_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } From eb9e520d7655c433d9a8f557d609e5ee026b035d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 11:05:15 +0800 Subject: [PATCH 06/14] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/common/PagerHelper.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 54dacc8..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -80,4 +80,30 @@ public class PagerHelper { Pager newPager = getPager(oldPager.getPageSize(), oldPager.getCurrentPage(), rowCount); return newPager; } + + public static void refreshPager(Pager pager,int rowCount){ + pager.setPageSize(pager.getPageSize() == 0 ? 10 : pager.getPageSize()); + pager.setTotalRows(rowCount); + + int totalPages = rowCount / pager.getPageSize(); + int mod = rowCount % pager.getPageSize(); + if (mod > 0) { + totalPages++; + } + pager.setTotalPages(totalPages); + if(pager.getCurrentPage() > totalPages) { + pager.setCurrentPage(totalPages); + } + + int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); + pager.setStartRow(startRow); + + int endRow; + if (startRow + pager.getPageSize() <= rowCount) { + endRow = startRow + pager.getPageSize() - 1; + } else { + endRow = rowCount; + } + pager.setEndRow(endRow); + } } From faf9bd4b14ad20e2c90d5ae78df0bd3b96393408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 11:29:29 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 80a2fb7..9f449f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -96,7 +96,7 @@ public class PagerHelper { } int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); - pager.setStartRow(startRow); + pager.setStartRow(startRow == 0 ? 1 : startRow); int endRow; if (startRow + pager.getPageSize() <= rowCount) { From 6aeb6bdddeaf72d6701fc175550a0a8fe6131f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 5 Nov 2020 16:56:41 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index 04ac902..075da09 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -48,4 +48,7 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("最终良品率") private String finalQualifiedRate; + @ApiParam("不良描述") + private String defectMemo; + } From 0ea3354b70e66a4216d141033a2258ebc4425083 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Thu, 5 Nov 2020 17:09:22 +0800 Subject: [PATCH 09/14] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E6=97=B6=E9=97=B4=E5=92=8Ccount=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 dce7352..4005ae5 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 @@ -228,6 +228,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("erp单号") private String erpSrcNo; + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam("汇总收货数量") + private Double sumRcQty; + /** * 状态:1=新建,10=收货中,20=收货完成, @@ -326,15 +334,15 @@ public class WmsPOMasterDetails extends BaseBean { this.itemStatus = itemStatus; } - public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) { + public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double sumQty,Double sumRcQty) { this.orderNo = orderNo; this.planDate=planDate; this.planTime=planTime; - this.qty = qty; - this.rcQty = rcQty; this.vendorNo=vendorNo; this.dock=dock; this.poStatus=poStatus; + this.sumQty = sumQty; + this.sumRcQty = sumRcQty; } } From ae1bb4376469f4701caa87b5d082d2c118942769 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 5 Nov 2020 23:23:01 +0800 Subject: [PATCH 10/14] =?UTF-8?q?mgn-bj=20edi=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 3 +++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 3 ++- .../pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 21 +++++++++++++++++++++ .../i3plus/pojo/mes/model/mgn/bj/edi/Part.java | 5 ----- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 6c046d9..bc61bd2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable { @ApiParam("图表类型颜色") private String color; + @ApiParam("停线时间比率") + private Integer downtimeRate; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6b1f00b..8524845 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -202,10 +202,11 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workType = workType; this.orderNo = orderNo; } - public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, String workCenterCode, String workCellCode) { + this.id = id; this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; 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 6640422..c1994c1 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 @@ -31,10 +31,16 @@ public class MgnBjBoardModel implements Serializable { private Integer warnQty; @ApiParam("预警率") private Integer warnRate; + @ApiParam("目标数量") + private Integer targetQty; + @ApiParam("计划　数量") + private Integer planQty; @ApiParam("目标合格率") private Integer targetRate = 0; @ApiParam("一次合格率") private Integer onceQualityRate = 0; + @ApiParam("待生产订单数量") + private Integer waitProduceQty = 0; @ApiParam(value = "显示颜色") private String color; @@ -42,6 +48,21 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("x坐标内容") private String xAxis; + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("班次人数") + private Integer shiftNum; + + @ApiParam("产品位置代码") + private String produceCategoryCode; + + @ApiParam("产品位置名称") + private String produceCtgyName; + + @ApiParam("时段") + private String timeInterval; + @ApiParam("x坐标内容") private List xAxisList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index a1b7261..50c452d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author Wynne.Lu @@ -57,8 +55,5 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; - @ApiParam("单元格编号") - private Map cellNoMap = new HashMap<>(); - } From 08011a57226c79a8a4f5e7909eec17e069362655 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 00:52:16 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) 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 21110ed..bec1faf 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 @@ -5,6 +5,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -380,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; + @Transient + @ApiParam(value = "处理中/创建中订单总数量") + private Long handleItemCount; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -412,6 +417,13 @@ public class WmsDocMovementDetails extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public String getLine() { + if (StringUtil.isEmpty(this.line)) { + return ""; + } + return this.line; + } + @Version @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") @@ -470,16 +482,27 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { - System.out.println("=======参数方法"); + public WmsDocMovementDetails (String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String partNo) { this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.itemStatus= itemStatus; this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; this.partNo=partNo; + } + + + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) { + this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus = itemStatus; + this.orderNo = orderNo; + this.handleItemCount = handleItemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From cd2076d66a2444c4919bbb48f0bea71f5aa860af Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 01:31:09 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= 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 bec1faf..dc856c6 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 @@ -494,7 +494,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount, String planTime) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -503,6 +503,7 @@ public class WmsDocMovementDetails extends BaseBean { this.itemStatus = itemStatus; this.orderNo = orderNo; this.handleItemCount = handleItemCount; + this.planTime = planTime; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From c0d52b93f71c7b909bb1dd7532c835da23b8fafa Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 02:26:09 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 dc856c6..d9348ba 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 @@ -320,7 +320,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "订单总数量") - private Integer itemCount; + private Long itemCount; @Transient @ApiParam(value = "完成订单数量") @@ -381,9 +381,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; - @Transient - @ApiParam(value = "处理中/创建中订单总数量") - private Long handleItemCount; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -494,7 +491,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount, String planTime) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -502,8 +499,8 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; this.itemStatus = itemStatus; this.orderNo = orderNo; - this.handleItemCount = handleItemCount; this.planTime = planTime; + this.itemCount = itemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From 2ca398468fab5f65e2b15c34cdfcd1ffcae21d78 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Fri, 6 Nov 2020 19:32:39 +0800 Subject: [PATCH 14/14] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) 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 d9348ba..21d4aae 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 @@ -641,4 +641,33 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.planTime = planTime; } + public WmsDocMovementDetails (String erpSrcNo,String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + }