From 6ee61abfc984d231b1dee94f3dc6ef1ced743555 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 13 Mar 2019 19:58:05 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 2831670..a5b1524 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -132,6 +132,14 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "目的条码状态", example = "1") public Integer destSnStatus; + @Column(name = "DATE_CODE") + @ApiParam(value = "生产日期") + public String dateCode; + + @Column(name = "FIX_LOT_NO") + @ApiParam(value = "特殊批次") + private String fixLotNo; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ From 11a2a729174bab648351f93e3eca3495312dcde8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 14 Mar 2019 18:16:21 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=A6=81=E7=94=A8=E3=80=81=E5=90=AF=E7=94=A8=E3=80=81?= =?UTF-8?q?=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) 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 9571e6f..0240ccf 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 @@ -2013,4 +2013,46 @@ public class WmsEnumUtil { return null; } } + + /** + * 数据状态 + * 1 启用 + * 2 禁用 + * 3 全部 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_STATUS { + ENABLE(1, "启用"), + DISABLE(2, "禁用"), + LOCKING(3, "全部"); + + private int value; + private String description; + + DATA_STATUS() { + } + + DATA_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } From 207b7ea7eb558cea7b960498e118a0cb604cabea Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 14 Mar 2019 18:39:37 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3id=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8Ashiro=E6=8E=88=E6=9D=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java index eff481b..865e00d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java @@ -35,10 +35,10 @@ public class SnowflakeIdMaker { private long twepoch = 1288834974657L; - private long workerIdBits = 5L; + private long workerIdBits = 10L; private long datacenterIdBits = 5L; - private long maxWorkerId = -1L ^ (-1L << workerIdBits); - private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); + private long maxWorkerId = -1L ^ (-1L << workerIdBits); //1023 + private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); //30 private long sequenceBits = 12L; private long workerIdShift = sequenceBits; From 74b63d8a72301fd22a4219b917b7f20b85c33e30 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 14 Mar 2019 20:09:12 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E6=A0=B9=E6=8D=AE=E4=BB=BB=E5=8A=A1=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 26 +++++++++++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 5 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 ++++++++++ 3 files changed, 38 insertions(+), 5 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 0240ccf..a1ea07a 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 @@ -2022,18 +2022,20 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { - ENABLE(1, "启用"), - DISABLE(2, "禁用"), - LOCKING(3, "全部"); + ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), + LOCKING(3, "全部", "fa cell-fa fa-lock"); private int value; + private String name; private String description; DATA_STATUS() { } - DATA_STATUS(int value, String description) { + DATA_STATUS(int value, String name, String description) { this.value = value; + this.name = name; this.description = description; } @@ -2045,10 +2047,24 @@ public class WmsEnumUtil { return description; } + public String getName() { + return name; + } + + 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].getName(); + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { + if (values()[i].name.equals(desc)) { tmp = values()[i].value; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 4f5de49..eb5b996 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -56,6 +56,11 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; + // 1=true, 2 = false + @Column(name="AUTO_INIT") + @ApiParam(value = "任务自动初始化", example = "0") + private Integer autoInit; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); 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 2bfbed9..ef9999f 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 @@ -1423,4 +1423,16 @@ public class WmsHqlPack { getStringBuilderPack(wmsDataAuth, result); return result.toString(); } + + /** + * 根据条件查询任务明细信息 + * @param taskDetails + * @return + */ + public static String packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); + getStringBuilderPack(taskDetails, result); + return result.toString(); + } } From 166b725e433eb03b2423479bfb9184ba701f13e8 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 14 Mar 2019 21:25:40 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 6d6e141..c544ccd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -101,4 +101,12 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "PRIORITY") @ApiParam(value = "优先级", example = "1") public Integer priority; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; + + @Column(name = "CUST_ORDER_NO") + @ApiParam(value = "客户单号") + private String custOrderNo; } From aa1b4ac805643ac5ecd2768e3a20ed910dd79f81 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 14 Mar 2019 21:44:21 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 25 ++++++---------------- 1 file changed, 6 insertions(+), 19 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 a1ea07a..80aec01 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 @@ -2027,15 +2027,12 @@ public class WmsEnumUtil { LOCKING(3, "全部", "fa cell-fa fa-lock"); private int value; - private String name; + private String code; private String description; - DATA_STATUS() { - } - - DATA_STATUS(int value, String name, String description) { + DATA_STATUS(int value, String code, String description) { this.value = value; - this.name = name; + this.code = code; this.description = description; } @@ -2047,25 +2044,15 @@ public class WmsEnumUtil { return description; } - public String getName() { - return name; + 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].getName(); - } - } - return tmp; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].name.equals(desc)) { - tmp = values()[i].value; + tmp = values()[i].getCode(); } } return tmp; From c4a9a4ac1e9fb9777952ba8b1a7e37b08a5033f8 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 15 Mar 2019 14:01:27 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3id=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=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/base/codemaker/SnowflakeIdMaker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java index 865e00d..6a7d958 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java @@ -35,9 +35,9 @@ public class SnowflakeIdMaker { private long twepoch = 1288834974657L; - private long workerIdBits = 10L; + private long workerIdBits = 5L; private long datacenterIdBits = 5L; - private long maxWorkerId = -1L ^ (-1L << workerIdBits); //1023 + private long maxWorkerId = -1L ^ (-1L << workerIdBits); //30 private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); //30 private long sequenceBits = 12L; From 114816d4830849d77aa890aa84761a81f9ab4723 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 15 Mar 2019 17:50:40 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ---------------------- 1 file changed, 34 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 ca1763a..a5b6f20 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 @@ -958,40 +958,6 @@ public class WmsEnumUtil { } /** - * 库存条码表条码质量状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_QUALITY_STATUS { - NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离"); - - private int value; - private String description; - - SN_QUALITY_STATUS(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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; - } - } - - /** * 业务表：库存条码状态 * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ From 972d2b04a7611d1a3e4f32fc99638bf9c49cdc1b Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Fri, 15 Mar 2019 18:56:16 +0800 Subject: [PATCH 9/9] =?UTF-8?q?wmshpak=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 ef9999f..4424e51 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 @@ -802,6 +802,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); getStringBuilderPack(wmsStockQuan, result); @@ -1408,9 +1409,6 @@ public class WmsHqlPack { */ public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { StringBuffer result = new StringBuffer(); - if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){ - HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result); - } if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){ HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result); }