From 950303231fe96bbf2b0fa1c28f513ad717e5f252 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 6 Dec 2018 11:12:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a5b40ae..ea7894b 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 @@ -1811,7 +1811,8 @@ public class WmsEnumUtil { LOCATE_SEQ("LOCATE_SEQ", "库位序号"), OP_SEQ("OP_SEQ", "作业类型序号"), TRAN_SEQ("TRAN_SEQ", "交易类型序号"), - STEP_SEQ("STEP_SEQ", "步骤调用序号"); + STEP_SEQ("STEP_SEQ", "步骤调用序号"), + ORDER_NO("ORDER_NO", "盘点主表序号"); private String code; private String description; 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 246524b..a9dde28 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 交易类型表 @@ -42,9 +43,13 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "序号", example = "-1") private Integer seq; - @Column(name = "PROG_CODE") - @ApiParam(value = "处理程序", example = "-1") + @Column(name = "AG_ID") + @ApiParam(value = "作业流程", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long agId; + @Transient + @ApiParam("中文流程名称") + private String agNameC; + } From 1b54063b5686f59d584673c2dda55dfcea3339ab Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 6 Dec 2018 11:53:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=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/model/wms/CheckPointModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java index 8a6b197..eabefdf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java @@ -40,6 +40,6 @@ public class CheckPointModel { /** *实际抽点数量【从前端输入获取】 */ - private Double actQty; + private Integer actQty; } From 660db622a8054dd2edf3d0109b1663aadc7ab6a8 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 6 Dec 2018 14:51:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=8E=BB=E6=8E=89=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index a59768a..5586f68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -40,10 +40,6 @@ public class WmsActionModule extends BaseBean { @ApiParam("实现类") public String callClass; - @Column(name="CALL_FUN") - @ApiParam("调用方法") - public String callFun; - @Column(name="AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; From ca78fb48fc1522a54cd497136ad43bff52c18443 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 6 Dec 2018 15:21:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=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 | 3 +++ 1 file changed, 3 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 12636d5..4f7483f 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 @@ -1160,6 +1160,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); // 单据编号 HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + getStringBuilderPack(wmsActionLog, result); return result.toString(); @@ -1182,6 +1183,8 @@ public class WmsHqlPack { getStringBuilderPack(wmsActionLogDetails, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + return result.toString(); } } From 398de72b6ca040d11286fed20cf26141ad4ab42d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 6 Dec 2018 15:48:14 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=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/WmsMoveMaster.java | 4 ++++ 1 file changed, 4 insertions(+) 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 8aeed96..e0597a1 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 @@ -51,4 +51,8 @@ public class WmsMoveMaster extends BaseBean { @Column(name="REMARK") @ApiParam("备注") public String reMark; + + @Column(name="TRANS_TYPE_CODE") + @ApiParam("交易代码") + public String transCode; } From d87eedb28598a19ffa954437d24f96bc9daf9c4a Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 6 Dec 2018 16:39:49 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 4f7483f..02b81b0 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 @@ -698,10 +698,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 订单号 - HqlPack.getStringEqualPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + // 物料代码 + HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); + getStringBuilderPack(wmsTempOrderLock, result); return result.toString(); From 787501c59cdb72ff2c75a6201e8d1c049fe66441 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 7 Dec 2018 11:05:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=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/bean/WmsTaskInfo.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 764561c..38a3dbb 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 @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_TASK") -@Api("ASN主表信息") +@Api("作业任务表") public class WmsTaskInfo extends BaseBean { @Column(name="MOVE_NO") @@ -48,6 +48,10 @@ public class WmsTaskInfo extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name="TASK_STATUS") - @ApiParam(value = "状态", example = "1") + @ApiParam(value = "任务状态", example = "1") public Integer taskStatus; + + @Column(name="TRANS_TYPE_CODE") + @ApiParam("交易类型") + private String transTypeCode; }