From 288ecaedba34b2bb3a3cd761ac72e514f38b481b Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Thu, 7 Mar 2019 17:25:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8B=E4=B8=80=E6=AD=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=20POJO=20=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/rules/WmsSNNextStatusRule.java | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java new file mode 100644 index 0000000..56215db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.wms.rules; + +/** + * @Description : 纯POJO，WMS 获取条码下一步的状态 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2019-03-07 16:40 + * @Modify: + **/ +public class WmsSNNextStatusRule { + + // 交易类型代码 + private int transTypeCode; + // 业务类型代码 + private int busiTypeCode; + // 一步法操作 + private boolean isOneStep; + // 免检 + private boolean isSkipQC; + // 自动入库 + private boolean isDefaultInStock; + // 原条码状态 + private int srcSNStatusCode; + // 目的条码状态 + private int destSNStatusCode; + + public int getTransTypeCode() { + return transTypeCode; + } + + public void setTransTypeCode(int transTypeCode) { + this.transTypeCode = transTypeCode; + } + + public int getBusiTypeCode() { + return busiTypeCode; + } + + public void setBusiTypeCode(int busiTypeCode) { + this.busiTypeCode = busiTypeCode; + } + + public boolean isOneStep() { + return isOneStep; + } + + public void setOneStep(boolean oneStep) { + isOneStep = oneStep; + } + + public boolean isSkipQC() { + return isSkipQC; + } + + public void setSkipQC(boolean skipQC) { + isSkipQC = skipQC; + } + + public boolean isDefaultInStock() { + return isDefaultInStock; + } + + public void setDefaultInStock(boolean defaultInStock) { + isDefaultInStock = defaultInStock; + } + + public int getDestSNStatusCode() { + return destSNStatusCode; + } + + public void setDestSNStatusCode(int destSNStatusCode) { + this.destSNStatusCode = destSNStatusCode; + } + + public int getSrcSNStatusCode() { + return srcSNStatusCode; + } + + public void setSrcSNStatusCode(int srcSNStatusCode) { + this.srcSNStatusCode = srcSNStatusCode; + } +} From 7ba8fa832c7bb159e8dc8a36c3519de4a83dcca8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 18:24:48 +0800 Subject: [PATCH 2/3] =?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 --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 ++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 8 ++++++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 9d6017f..2036d64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -53,7 +53,7 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="QTY") + @Transient @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -61,6 +61,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格处理数量", example = "0") + public Double rejectQty; + @Column(name="UNIT") @ApiParam("单位") public String unit; 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 f1016d5..b4d7163 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 @@ -100,6 +100,22 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "数量", example = "0") public Double qty; + @Column(name="SRC_QC_STATUS") + @ApiParam(value = "源质量状态", example = "1") + public Integer srcQcStatus; + + @Column(name="SRC_SN_STATUS") + @ApiParam(value = "源条码状态", example = "1") + public Integer srcSnStatus; + + @Column(name="DEST_QC_STATUS") + @ApiParam(value = "目的质量状态", example = "1") + public Integer descQcStatus; + + @Column(name="DEST_SN_STATUS") + @ApiParam(value = "目的条码状态", example = "1") + public Integer destSnStatus; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index f931e6e..fa7b83f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -67,9 +67,13 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "交易数量", example = "0") public Double qty; + @Column(name = "REJECT_QTY") + @ApiParam(value = "不合格交易数量", example = "0") + public Double rejectQty; + @Column(name = "TRANS_NO") - @ApiParam(value = "事务编号", example = "1") - public Long transNo; + @ApiParam(value = "事务编号") + public String transNo; /** * ASN,PO,SO diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index dc0af8b..4a69c08 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -68,9 +68,13 @@ public class WmsTransSn extends BaseBean { @ApiParam(value = "交易数量", example = "0") public Double qty; + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格交易数量", example = "0") + public Double rejectQty; + @Column(name="TRANS_NO") @ApiParam("事务编号") - public Long transNo; + public String transNo; @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") 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 9be52e1..e2e2f47 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 @@ -809,11 +809,11 @@ public class WmsHqlPack { * @param tranNo * @return */ - public static String packWmsTransSn(Long tranNo) { + public static String packWmsTransSn(String tranNo) { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(tranNo, "transNo", result); + HqlPack.getStringEqualPack(tranNo, "transNo", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); From 9a9c7ba7ec1576f6944d487e9717f31445df8470 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Thu, 7 Mar 2019 20:09:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8B=E4=B8=80=E6=AD=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/rules/WmsSNNextStatusRule.java | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java index 56215db..cec3ca8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java @@ -14,11 +14,11 @@ public class WmsSNNextStatusRule { // 业务类型代码 private int busiTypeCode; // 一步法操作 - private boolean isOneStep; + private boolean oneStep; // 免检 - private boolean isSkipQC; + private boolean skipQC; // 自动入库 - private boolean isDefaultInStock; + private boolean defaultInStock; // 原条码状态 private int srcSNStatusCode; // 目的条码状态 @@ -40,43 +40,43 @@ public class WmsSNNextStatusRule { this.busiTypeCode = busiTypeCode; } - public boolean isOneStep() { - return isOneStep; + public int getDestSNStatusCode() { + return destSNStatusCode; } - public void setOneStep(boolean oneStep) { - isOneStep = oneStep; + public void setDestSNStatusCode(int destSNStatusCode) { + this.destSNStatusCode = destSNStatusCode; } - public boolean isSkipQC() { - return isSkipQC; + public int getSrcSNStatusCode() { + return srcSNStatusCode; } - public void setSkipQC(boolean skipQC) { - isSkipQC = skipQC; + public void setSrcSNStatusCode(int srcSNStatusCode) { + this.srcSNStatusCode = srcSNStatusCode; } - public boolean isDefaultInStock() { - return isDefaultInStock; + public boolean isOneStep() { + return oneStep; } - public void setDefaultInStock(boolean defaultInStock) { - isDefaultInStock = defaultInStock; + public void setOneStep(boolean oneStep) { + this.oneStep = oneStep; } - public int getDestSNStatusCode() { - return destSNStatusCode; + public boolean isSkipQC() { + return skipQC; } - public void setDestSNStatusCode(int destSNStatusCode) { - this.destSNStatusCode = destSNStatusCode; + public void setSkipQC(boolean skipQC) { + this.skipQC = skipQC; } - public int getSrcSNStatusCode() { - return srcSNStatusCode; + public boolean isDefaultInStock() { + return defaultInStock; } - public void setSrcSNStatusCode(int srcSNStatusCode) { - this.srcSNStatusCode = srcSNStatusCode; + public void setDefaultInStock(boolean defaultInStock) { + this.defaultInStock = defaultInStock; } }