From 8a78c193293545d75a9d055912e74ffd6561df03 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 5 Mar 2019 20:10:48 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=9C=8D=E5=8A=A1=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 10255dc..1fd89ec 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 @@ -1237,4 +1237,21 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 根据条件查询库存条码信息 + * @param wmsStockSn + * @return + */ + public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); + getStringBuilderPack(wmsStockSn, result); + return result.toString(); + } } From 380f16943fd6e66a33875bbb2d3aae74d228c1a7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 12:04:58 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=9C=8D=E5=8A=A1=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 29 +++++++++++++++++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) 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 1ef80a0..a35f07d 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 @@ -56,8 +56,31 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "TOTAL_QTY") - @ApiParam(value = "总数量", example = "0") - private Double totalQty; + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; } 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 1fd89ec..b4fd62a 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 @@ -1245,13 +1245,24 @@ public class WmsHqlPack { */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); } + + /** + * 根据条件查询库存信息 + * @param wmsStockQuan + * @return + */ + public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result); + getStringBuilderPack(wmsStockQuan, result); + return result.toString(); + } } From 3faba3bbc26b9df7b916e587af03398ef01a5de2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:06:59 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 5 ++++ .../i3plus/pojo/model/wms/ActionButlerModel.java | 28 ---------------------- .../i3plus/pojo/model/wms/WmsMoveInfoModel.java | 15 ++++++++++++ modules/i3plus-pojo-wms/pom.xml | 5 ---- .../pojo/wms/bean/WmsActionResponseBean.java | 4 +--- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 2 -- .../i3plus/pojo/wms/bean/WmsOptionModel.java} | 4 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 8 files changed, 27 insertions(+), 40 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java} (89%) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 24763f0..e975c42 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -29,6 +29,11 @@ i3plus-pojo-report + + i3plus.pojo + i3plus-pojo-wms + + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java deleted file mode 100644 index fdf6c5f..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 流程管家模型 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-28 15:50 - * @Modify: - **/ -@Data -public class ActionButlerModel { - - private String orderNo; - - private String sn; - - private String aLId; - - private String userNo; - - private String fixNo; - - private String barCode; - - private String funCallName; -} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java new file mode 100644 index 0000000..46f72e4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveInfoModel { + +} diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..db2f77a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -16,11 +16,6 @@ i3plus.pojo - i3plus-pojo-model - - - - i3plus.pojo i3plus-pojo-base diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index d87e915..ce8cd86 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -45,7 +43,7 @@ public class WmsActionResponseBean { public List informations; @ApiParam("可选项") - public List options; + public List options; @ApiParam("选中的明细数据") public Obj details; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 1fbbbf4..b572de7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -1,13 +1,11 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; -import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java similarity index 89% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index 7ab343e..fa5063d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; * @Modify: **/ @Data -public class OptionModel { +public class WmsOptionModel { private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c019a19..48154b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -106,4 +106,8 @@ public class WmsPart extends BaseBean { @Column(name="LOT_CHECK_RULE") @ApiParam(value ="批次校验规则") private String lotCheckRule; + + @Column(name="IN_LOCATE_NO") + @ApiParam(value ="默认入库库位") + private String inLocateNo; } From e80d4769025ffb971cacc83219e11d727a67bcfe Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:23:55 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=B0=83=E6=95=B4model=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMoveInfoModel.java | 15 ------------- .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 25 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 15 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java deleted file mode 100644 index 46f72e4..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 库存移动单模型 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-03-06 15:50 - * @Modify: - **/ -@Data -public class WmsMoveInfoModel { - -} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java new file mode 100644 index 0000000..5c7bddf --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveMasterModel { + public String orderNo; + + public Integer orderStatus; + + public String reMark; + + private String transTypeCode; + + private List moveDetails; +} From b0d34a04b48976b2e8c796fc964fd251e848ed53 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:24:44 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E8=B0=83=E6=95=B4model=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 59 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsMoveSnModel.java | 42 +++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java new file mode 100644 index 0000000..d885242 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动明细模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveDetailsModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String vendorNo; + + public String custNo; + + public Double qty; + + public Double transQty; + + public String unit; + + public String srcWhNo; + + public String srcZoneNo; + + public String srcLocateNo; + + public String destWhNo; + + public String destZoneNo; + + public String destLocateNo; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + /** + * ASN,PO,SO + */ + public Integer refType; + + public String refSrc; + + private List moveDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java new file mode 100644 index 0000000..5d44741 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动条码模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveSnModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String unit; + + public String sn; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + public String reMark; + + public String lotNo; + + public String packAgeNo; + + public Double qty; + + public String srcLocateNo; + + public String destLocateNo; +} From 8e029e82e0696e4221c45555e1f7256dde09a0b1 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 6 Mar 2019 20:01:14 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E9=82=AE=E4=BB=B6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 34 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 4 +++ .../i3plus/pojo/platform/bean/SysMessage.java | 6 +++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 0d0e9c0..4d003e2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1047,4 +1047,38 @@ public class ImppEnumUtil { return tmp; } } + + //messageReceiverType + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_RECEIVER_TYPE { + INTERNAL(1, "内部人员接收"), + EXTERNAL(2, "外部人员接收"), + URGENT(3, "紧急联系人接收"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private MESSAGE_RECEIVER_TYPE(int value, String description) { + this.value = value; + this.description = 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; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 32d44bc..85501de 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -55,6 +55,10 @@ public class SysConfig extends BaseBean { @ApiParam(value ="参数值") private String configValue; + @Column(name="CONFIG_VALUE_OPTION") + @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}") + private String configValueOption; + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="参数描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index be4d80c..978c2d1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -55,8 +55,12 @@ public class SysMessage extends BaseBean { @ApiParam(value ="发送者名称" ) private String messageSenderNameRdd; + @Column(name="MESSAGE_RECEIVER_TYPE") + @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") + private Integer messageReceiverType; + @Column(name="MESSAGE_RECEIVERS_ID") - @ApiParam(value ="发送者id" ) + @ApiParam(value ="收件者id" ) private String messageReceiversId; @Column(name="MESSAGE_RECEIVERS_NAME_RDD") From 268f86b602cac55472575d80c5efe6e8f0ccd75a Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 6 Mar 2019 20:25:14 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 0a7d5f2..964f4c8 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 @@ -72,9 +72,9 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name="QTY") - @ApiParam(value = "已收数量", example = "0") - public Double qty; + @Column(name="SRC_QTY") + @ApiParam(value = "源数量", example = "0") + public Double srcQty; @Column(name="SRC_LOCATE_NO") @ApiParam("源库位代码") @@ -92,6 +92,10 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; + @Column(name="DEST_QTY") + @ApiParam(value = "目标数量", example = "0") + public Double destQty; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ From 5b7f23ca8231479090e2f06ffe8c7c44f4dd215f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 6 Mar 2019 20:32:45 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8B=86=E5=88=86=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 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ 1 file changed, 4 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 964f4c8..f1016d5 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 @@ -96,6 +96,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "目标数量", example = "0") public Double destQty; + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ From 1aa8f7fd1a4c8976b7316403144b5827a17214dc Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 6 Mar 2019 21:34:07 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 105 ++++++++++++- modules/i3plus-pojo-wms/pom.xml | 4 + .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 24 +-- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 + .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 23 ++- .../pojo/wms/bean/WmsDocMovementDetails.java | 32 +++- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 9 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 11 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 44 +++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 20 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 26 +++- .../pojo/wms/repository/WmsOpTypeRepository.java | 2 +- .../wms/repository/WmsTaskDetailsRepository.java | 17 ++ .../pojo/wms/repository/WmsTaskSrcRepository.java | 17 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 171 +++++++++++++++------ 16 files changed, 389 insertions(+), 123 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java 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 22163ea..3bef53e 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 @@ -11,6 +11,55 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class WmsEnumUtil { /** + * 拆分规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPLIT_OR_MERGE_RULE { + WH(10, "WH", "仓库"), ZONE(20, "ZONE", "存储区"), PART(30, "PART", "物料"); + private int value; + private String code; + private String description; + + SPLIT_OR_MERGE_RULE(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 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; + } + } + + /** * 订单明细信息 是否免费 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -710,9 +759,14 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { - ASN(1, "ASN"), - PO(10, "PO"), - SO(20, "SO"); + ASN(10, "ASN"), + PO(20, "PO"), + SO(30, "SO"), + MOVE(40, "MOVE"), + IN_STOCK(50, "IN_STOCK"), + SHIPPING(60, "SHIPPING"), + QC(70, "QC"), + CS(80, "CS"); private int value; private String description; @@ -776,6 +830,40 @@ public class WmsEnumUtil { } /** + * 单据是否生成任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_GENERAL_TASK { + CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成"); + + private int value; + private String description; + + IS_GENERAL_TASK(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=在途 */ @@ -992,7 +1080,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ITEM_STATUS { - CREATE(1, "创建"),FINISH(10, "已处理"); + CREATE(1, "创建"), FINISH(10, "已处理"); private int value; private String description; @@ -1174,9 +1262,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALD_EXECUTE_STATUS { - NORMAL(1, "创建"), - PROCESSING(10, "处理中"), - COMPLETED(20, "已完成"); + NORMAL(10, "创建"), + PROCESSING(20, "处理中"), + COMPLETED(30, "已完成"); private int value; private String description; @@ -1497,9 +1585,10 @@ public class WmsEnumUtil { return tmp; } } + /** * 流程明细动作类型 - * 10=交互动作,20=后台动作,30=提交动作 + * 10=交互动作,20=后台动作,30=提交动作 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_VALUE_TYPE { diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..31ca821 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -23,6 +23,10 @@ i3plus.pojo i3plus-pojo-base + + i3plus.platform + i3plus-platform-common + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index d18a25a..8c4d440 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : ASN订单主表 @@ -24,11 +26,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_ASN_MASTER") +@Table(name = "WMS_DOC_ASN_MASTER") @Api("ASN主表信息") public class WmsASNMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; @@ -36,7 +38,7 @@ public class WmsASNMaster extends BaseBean { * 单据类型:REG=原物料采购, * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 */ - @Column(name="ASN_TYPE") + @Column(name = "ASN_TYPE") @ApiParam("单据类型") public String asnType; @@ -44,23 +46,23 @@ public class WmsASNMaster extends BaseBean { * 状态:1=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="ASN_STATUS") + @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="VERSION") + @Column(name = "VERSION") @ApiParam("版本") public String version; - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="PO_NO") + @Column(name = "PO_NO") @ApiParam("PO单号") public String poNo; @@ -68,7 +70,11 @@ public class WmsASNMaster extends BaseBean { @ApiParam("集装箱号") public String containerNo; - @Column(name="IS_TASK") + @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Transient + @ApiParam(value = "单据明细集合") + public List wmsASNMasterDetailsList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 905b851..b5934c9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : ASN订单明细信息 @@ -109,4 +111,5 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name="REC_QTY") @ApiParam(value = "已收数量", example = "0") public Double recQty; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 5a09848..e568fc1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : 盘点单主表信息 @@ -24,11 +26,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_CS_ORDER") +@Table(name = "WMS_DOC_CS_ORDER") @Api("盘点单主表信息") public class WmsCSOrderMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; @@ -36,23 +38,28 @@ public class WmsCSOrderMaster extends BaseBean { * 单据类型:10=日常盘点,20=月度盘点, * 30=季度盘点,40=年度盘点 */ - @Column(name="ORDER_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型", example = "10") public Integer orderType; - @Column(name="ORDER_STATUS") - @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1" ) + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1") public Integer orderStatus; - @Column(name="ACTION_PERSENT") + @Column(name = "ACTION_PERSENT") @ApiParam("盘点进度") public String actionPersent; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="IS_INVENTORY") + @Column(name = "IS_INVENTORY") @ApiParam(value = "是否允许清点", example = "1") public Integer isInventory; + + @Transient + @ApiParam(value = "盘点明细集") + public List wmsCSOrderDetailsList; + } 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 ea58ba7..f870b57 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 @@ -13,7 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :移库单详情实体(用于转储类业务) + * @Description :移库单明细实体(用于转储类业务) * @Reference : * @Author : dragon.xu * @CreateDate : 2018-11-13 16:06 @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_MOVEMENT_DETAILS") -@Api("移库单详情表") +@Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { @Column(name = "ORDER_NO") @ApiParam(value = "单号") @@ -47,13 +47,29 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "SRC_WH") - @ApiParam(value = "发出库仓库") - private String srcWh; + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; - @Column(name = "DEST_WH") - @ApiParam(value = "接收库仓库") - private String destWh; + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; @Column(name = "QTY") @ApiParam(value = "需求数量", example = "1") 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 e7d4099..c6759da 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 @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :移库单实体(用于转储类业务) @@ -99,12 +101,15 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "数量", example = "1") private Double qty; - @Column(name="IS_TASK") + @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; - @Column(name="PRIORITY") + @Column(name = "PRIORITY") @ApiParam(value = "优先级", example = "1") public Integer priority; + @Transient + @ApiParam(value = "移库单明细集合") + private List wmsDocMovementDetailsList; } 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 e113047..7e3ca01 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 @@ -66,11 +66,11 @@ public class WmsMoveDetails extends BaseBean { public String unit; @Column(name="SRC_WH_NO") - @ApiParam("仓库代码") + @ApiParam("源仓库代码") public String srcWhNo; @Column(name="SRC_ZONE_NO") - @ApiParam("存储区代码") + @ApiParam("源存储区代码") public String srcZoneNo; @Column(name="SRC_LOCATE_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 3268ddd..bd1aa1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -7,10 +7,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : 库存移动单主表信息 @@ -24,26 +26,27 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER") @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index e8b6fd9..e123665 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -9,11 +9,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; +import java.util.List; +import java.util.Map; /** * @Description : 作业类型 @@ -27,15 +29,15 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_OP_TYPE") +@Table(name = "WMS_OP_TYPE") @Api("作业类型") -public class WmsOpType extends BaseBean{ +public class WmsOpType extends BaseBean { - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam("类型编号") private String opTypeCode; - @Column(name="OP_TYPE_NAME") + @Column(name = "OP_TYPE_NAME") @ApiParam("类型名称") private String opTypeName; @@ -43,61 +45,65 @@ public class WmsOpType extends BaseBean{ @ApiParam(value = "序号", example = "0") private Integer seq; - @Column(name="TM_ID") + @Column(name = "TM_ID") @ApiParam(value = "交易处理组件ID", example = "0") private Integer tmId; - @Column(name="DATA_SRC") + @Column(name = "DATA_SRC") @ApiParam("数据来源") private String dataSrc; - @Column(name="ORDER_MIN") + @Column(name = "ORDER_MIN") @ApiParam(value = "单据处理下限", example = "0") private Integer orderMin; - @Column(name="ORDER_MAX") + @Column(name = "ORDER_MAX") @ApiParam(value = "单据处理上限", example = "0") private Integer orderMax; - @Column(name="CYCLE_MINS") + @Column(name = "CYCLE_MINS") @ApiParam(value = "处理周期(分钟)", example = "0") private Integer cycleMins; - @Column(name="LAST_TRANS_TIME") + @Column(name = "LAST_TRANS_TIME") @ApiParam(value = "末次处理时间") public String lastTransTime; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="末次处理时间",example = "2018-01-01 01:00:00") + @ApiParam(value = "末次处理时间", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String lastTransTimeStr; - @Column(name="IS_SPLIT") + @Column(name = "IS_SPLIT") @ApiParam(value = "是否拆分单据", example = "0") private Integer isSplit; - @Column(name="SPLIT_RULE") + @Column(name = "SPLIT_RULE") @ApiParam(value = "拆分规则") public String splitRule; - @Column(name="IS_MERGE") + @Column(name = "IS_MERGE") @ApiParam(value = "是否合并单据", example = "0") private Integer isMerge; - @Column(name="MERGE_RULE") + @Column(name = "MERGE_RULE") @ApiParam(value = "合并规则") public String mergeRule; - @Column(name="IS_AUTO_CLOSE") + @Column(name = "IS_AUTO_CLOSE") @ApiParam(value = "任务未完是否关闭", example = "0") private Integer isAutoClose; - @Column(name="USE_TIME") + @Column(name = "USE_TIME") @ApiParam(value = "标准工时(每箱)", example = "0") private Integer userTime; - @Column(name="IS_MULITI") + @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; + + @Transient + @ApiParam(value = "单据集") + private List> orderList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 3fef9e3..8d645ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -24,38 +24,42 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK") +@Table(name = "WMS_TASK") @Api("作业任务表") public class WmsTaskInfo extends BaseBean { - @Column(name="MOVE_NO") + @Column(name = "ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name = "MOVE_NO") @ApiParam("移动单号") public String moveNo; - @Column(name="USER_NO") + @Column(name = "USER_NO") @ApiParam("作业人员") public String userNo; - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam("作业类型") public String opTypeCode; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="TASK_STATUS") + @Column(name = "TASK_STATUS") @ApiParam(value = "任务状态", example = "1") public Integer taskStatus; - @Column(name="TRANS_TYPE_CODE") + @Column(name = "TRANS_TYPE_CODE") @ApiParam("交易类型") private String transTypeCode; - @Column(name="PRE_USE_TIME") + @Column(name = "PRE_USE_TIME") @ApiParam(value = "预计作业时间(分钟)", example = "1") public Integer preUseTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 3712662..c09c576 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -24,19 +24,31 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK_SRC") +@Table(name = "WMS_TASK_SRC") @Api("作业任务表") public class WmsTaskSrc extends BaseBean { - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam("作业类型编号") public String opTypeCode; - @Column(name="ORDER_TYPE") - @ApiParam("业务类型") - public String orderType; - - @Column(name="DATA_SRC") + @Column(name = "DATA_SRC") @ApiParam("数据来源") public String dataSrc; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "PRIORITY") + @ApiParam("优先级") + public String priority; + + @Column(name = "IS_SN") + @ApiParam("是否有条码") + public String isSn; + + @Column(name = "TRANS_CODE") + @ApiParam("默认交易类型") + public String transCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java index 59aad4c..01541f7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; import org.springframework.stereotype.Repository; /** - * @Description : 作业类型 + * @Description : 作业类型DAO层 * @Reference : * @Author : amy * @CreateDate : 2018-11-07 14:46 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java new file mode 100644 index 0000000..1c116f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层公用方法控制(作业任务明细信息) + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-06 17:16 + * @Modify: + **/ +@Repository +public interface WmsTaskDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java new file mode 100644 index 0000000..c248080 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业任务数据来源DAO层 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-06 14:41 + * @Modify: + **/ +@Repository +public interface WmsTaskSrcRepository extends BaseRepository { +} 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 1fd89ec..28155ba 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 @@ -1,11 +1,17 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.platform.common.tool.TimeTool; 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.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; + +import java.util.Date; +import java.util.List; /** * @Description : 仓库管理对象封装 @@ -18,7 +24,8 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * @param bean 实体对象 + * + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -59,7 +66,7 @@ public class WmsHqlPack { } /** - * 库存移动单详情查询封装 + * 库存移库单明细查询封装 * * @param wmsDocMovementDetails * @return @@ -76,6 +83,28 @@ public class WmsHqlPack { } /** + * 查询任务合并的移库单明细 查询条件封装 + * + * @param orderNos + * @return + */ + public static String packHqlWmsDocMovementDetailsByOrderNos(List orderNos) { + StringBuffer result = new StringBuffer(); + StringBuffer orderNoStr = new StringBuffer(); + for (int i = 0; i < orderNos.size(); i++) { + if (i == orderNos.size()) { + orderNoStr.append("'" + orderNos.get(i) + "'"); + } else { + orderNoStr.append("'" + orderNos.get(i) + "',"); + } + } + result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + + "and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + + "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo"); + return result.toString(); + } + + /** * 库存移动单查询封装 * * @param wmsDocMovementMaster @@ -183,10 +212,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); - if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { + if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { + if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } @@ -373,8 +402,38 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + getStringBuilderPack(wmsOpType, result); + + return result.toString(); + } + + /** + * 查询满足处理周期的作业类型 查询条件封装 + * + * @param wmsOpType + * @return + */ + public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) { + StringBuffer result = new StringBuffer(); getStringBuilderPack(wmsOpType, result); + result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins"); + return result.toString(); + } + + /** + * 作业任务数据来源 查询条件封装 + * + * @param wmsTaskSrc + * @return + */ + public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { + StringBuffer result = new StringBuffer(); + + //作业类型代码 + HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); + + getStringBuilderPack(wmsTaskSrc, result); return result.toString(); } @@ -395,7 +454,7 @@ public class WmsHqlPack { //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); @@ -461,7 +520,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); - getStringBuilderPack(wmsASNMaster,result); + getStringBuilderPack(wmsASNMaster, result); return result.toString(); } @@ -540,7 +599,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails,result); + getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -598,6 +657,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -620,10 +680,11 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -636,15 +697,16 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); @@ -653,10 +715,11 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -669,6 +732,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -695,6 +759,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -805,16 +870,18 @@ public class WmsHqlPack { return result.toString(); } + /** - *内部单据：库存移动单主表唯一性查询 + * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); getStringBuilderPack(wmsMoveMaster, result); @@ -823,14 +890,15 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); @@ -839,10 +907,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -852,15 +921,15 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsMoveDetails, result); @@ -869,10 +938,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1092,9 +1162,10 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { StringBuffer result = new StringBuffer(); //查询参数封装 agDescC;agNameC @@ -1107,9 +1178,10 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { StringBuffer result = new StringBuffer(); //查询参数封装 @@ -1156,6 +1228,7 @@ public class WmsHqlPack { /** * 作业记录 查询条件封装 + * * @param wmsActionLog * @return */ @@ -1163,19 +1236,19 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); + HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); + HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsActionLog, result); @@ -1184,15 +1257,16 @@ public class WmsHqlPack { /** * 作业记录明细 查询条件封装 + * * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){ + public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { StringBuffer result = new StringBuffer(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); @@ -1224,14 +1298,15 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 + * 按moveNo 取最后一笔插入的数据 + * * @param wmsMoveSn * @return */ public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsMoveSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); @@ -1239,19 +1314,21 @@ public class WmsHqlPack { } /** - * 根据条件查询库存条码信息 + * 根据条件查询库存条码信息 + * * @param wmsStockSn * @return */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn2d(), "sn2d", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result); + return result.toString(); } } From 933654a86a3182e4aac6ae77a0b950eee2933bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 7 Mar 2019 09:17:39 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE?= 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 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 3bef53e..e5ac171 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 @@ -500,6 +500,40 @@ public class WmsEnumUtil { } /** + * 库位状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_STATUS { + CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满"); + + private int value; + private String description; + + LOCATE_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; + } + } + + /** * 外部单据：移库单移动类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From ba90dfb1231712318f480b643aef4f1d6b08c49e Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 09:28:25 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=BB=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 50 +++------------------- .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 13 ++---- .../i3plus/pojo/model/wms/WmsMoveSnModel.java | 42 ------------------ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 12 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 13 ++++++ .../wms/repository/WmsTransModuleRepository.java | 16 +++++++ 7 files changed, 52 insertions(+), 98 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java 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 22163ea..e6ae28c 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 @@ -205,7 +205,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_STATUS { - CREATE(10, "新建"), + CREATE(1, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), WAREHOUSING(30, "入库中"), @@ -1664,6 +1664,4 @@ public class WmsEnumUtil { return description; } } - - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index d885242..30fe13b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,48 +15,7 @@ import java.util.List; * @Modify: **/ @Data -public class WmsMoveDetailsModel { - public String orderNo; - - public Integer item; - - public String partNo; - - public String partNameRdd; - - public String vendorNo; - - public String custNo; - - public Double qty; - - public Double transQty; - - public String unit; - - public String srcWhNo; - - public String srcZoneNo; - - public String srcLocateNo; - - public String destWhNo; - - public String destZoneNo; - - public String destLocateNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - public Integer itemStatus; - - /** - * ASN,PO,SO - */ - public Integer refType; - - public String refSrc; - - private List moveDetails; +public class WmsMoveDetailsModel implements Serializable { + private WmsMoveDetails details; + private List moveSn; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java index 5c7bddf..a4b54c4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,14 +14,7 @@ import java.util.List; * @Modify: **/ @Data -public class WmsMoveMasterModel { - public String orderNo; - - public Integer orderStatus; - - public String reMark; - - private String transTypeCode; - +public class WmsMoveMasterModel implements Serializable { + private WmsMoveMaster moveMaster; private List moveDetails; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java deleted file mode 100644 index 5d44741..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 库存移动条码模型 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-03-06 15:50 - * @Modify: - **/ -@Data -public class WmsMoveSnModel { - public String orderNo; - - public Integer item; - - public String partNo; - - public String partNameRdd; - - public String unit; - - public String sn; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - public Integer itemStatus; - - public String reMark; - - public String lotNo; - - public String packAgeNo; - - public Double qty; - - public String srcLocateNo; - - public String destLocateNo; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 3268ddd..285395a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -46,4 +46,16 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + + @Column(name="IS_URGENT") + @ApiParam(value = "是否紧急", example = "0") + public Integer isUrgent; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index a9dde28..9c4aa2c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -52,4 +52,17 @@ public class WmsTransType extends BaseBean { @ApiParam("中文流程名称") private String agNameC; + @Column(name = "TRANS_TYPE_DESC") + @ApiParam(value = "类型说明") + private String transTypeDesc; + + @Column(name = "TM_ID") + @ApiParam(value = "交易处理组件", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long tmId; + + @Column(name = "OP_TYPE_ID") + @ApiParam(value = "作业类型编号", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long opTypeId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java new file mode 100644 index 0000000..a94b4f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsTransModuleRepository extends BaseRepository { +} From e9a04ec9601dd4af30ace9eae78e0b562e6bf6a6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 09:31:49 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 285395a..7910609 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -24,22 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER") @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark;