From dcb9b59ec9faf216e63e0b93e98db75492cb430b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 3 Jul 2019 11:55:43 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java new file mode 100644 index 0000000..1e7a8cc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java @@ -0,0 +1,20 @@ +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; + +/** + * @Description : JOB返回数据处理模型 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-07-03 15:50 + * @Modify: + **/ +@Data +public class WmsJOBModel implements Serializable { + private List wmsMoveMasterModelList; + private String errorMessage; +} From 51753bb2371ec0787d08e2e032931974cd2cd7cb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 3 Jul 2019 17:49:21 +0800 Subject: [PATCH 02/12] bug#4515 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 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 0d9a204..895838c 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 @@ -118,7 +118,7 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); From 2cbc082c7b1d0bf3a0a55f79ee55692ef37245a3 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 3 Jul 2019 18:43:49 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=AF=B9=E8=B1=A1=20?= =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 15c744f..91b8cd0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -112,8 +112,12 @@ public class DynamicEntity extends BaseBean implements Serializable { try { val = getValue(propName,val); // LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val); - Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); - setMethod.invoke(this, val); + if(val != null){ + Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); + setMethod.invoke(this, val); + }else{ + LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val); + } } catch (NoSuchMethodException e) { // LOGGER.error("没有方法：{}",setMethodName,e); LOGGER.error("没有方法：{}",setMethodName); From dec3743911a705b026ebbc7a93ba934e68509d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 3 Jul 2019 18:52:10 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=8E=A8=E9=98=9F=E5=88=97=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 3 files changed, 41 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 457faaa..b93df5e 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 @@ -2853,4 +2853,39 @@ public class WmsEnumUtil { return tmp; } } + + /** + * PDA顶级菜单 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PDA_TOP_MENU { + RC("RC", "收货"), + QC("QC", "质检"), + PICK("PICK", "拣货"), + OUTSTOCK("OUTSTOCK", "出库"), + INSTOCK("INSTOCK", "入库"), + MOVESTOCK("MOVESTOCK", "移库"), + ASSIST("ASSIST", "辅助"), + NC("NC", "NC"), + CS("CS", "盘点"); + private String value; + private String description; + + PDA_TOP_MENU(String value, String description) { + this.value = value; + this.description = description; + } + + public String getCode() { + return value; + } + + public String getDescription() { + return description; + } + + public String getValue() { + return value; + } + } } \ No newline at end of file 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 f074954..c095d84 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 @@ -68,4 +68,8 @@ public class WmsTransType extends BaseBean { @Transient @ApiParam("菜单URL") private String menuUrl; + + public String getMenuUrl() { + return "/handle?transCode=" + this.transTypeCode; + } } 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 0d9a204..f5de668 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 @@ -1014,6 +1014,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result); + DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); From 8f5d952c4f0d306f7697a83351c1c94e5e03d4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 4 Jul 2019 12:09:06 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=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/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 b603eca..f17e87e 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 @@ -2002,6 +2002,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsUnit.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result); DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result); DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result); From cf96de80432557e620e5582e00e5bcf0392f5581 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Jul 2019 16:13:02 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E7=9B=98=E7=82=B9=20=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E7=BB=93=E6=9E=9C=E5=90=8C=E6=AD=A5ERP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) 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 de7eb41..34a617c 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 @@ -58,14 +58,26 @@ public class WmsCSOrderMaster extends BaseBean { @ApiParam(value = "是否允许清点", example = "1") public Integer isInventory; - @Transient - @ApiParam(value = "盘点明细集") - public List wmsCSOrderDetailsList; - @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + @Column(name = "IS_PART") + @ApiParam(value = "是否散件") + public Integer isPart; + + @Column(name = "YEAR") + @ApiParam("年度") + public String year; + + @Column(name = "IS_SYNC_ERP") + @ApiParam("是否同步ERP: 1=已同步，2=未同步") + public Integer isSyncErp; + + @Transient + @ApiParam(value = "盘点明细集") + public List wmsCSOrderDetailsList; + @Transient @ApiParam(value = "盘点物料清单") public String[] wmsCSParts; @@ -78,14 +90,6 @@ public class WmsCSOrderMaster extends BaseBean { @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; - @Column(name = "IS_PART") - @ApiParam(value = "是否散件") - private Integer isPart; - - @Column(name = "YEAR") - @ApiParam("年度") - public String year; - public Integer getIsInventoryVal() { return this.isInventory == null ? 0 :this.isInventory.intValue(); } From 6cd229e286ec200209bbbb35d13aa34f0adc49ab Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 4 Jul 2019 15:46:56 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8,=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index e68b624..3b79ccc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -96,20 +96,20 @@ public class CoreHqlPack { * @param position * @return */ - public static String packHqlSysPosition(SysPosition position){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysPosition(SysPosition position){ + DdlPackBean result = new DdlPackBean(); - // 查询参数封装 - HqlPack.getNumEqualPack(position.getParentId(),"parentId",result); - HqlPack.getStringLikerPack(position.getName(),"name",result); - HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); - // 添加默认排序 - HqlPack.getOrderDefault(position); + // 查询参数封装 + DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getStringEqualPack(position.getName(),"name",result); + DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result); + DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); - return result.toString(); + return result; } + /** * 组织复杂查询 * @param organize From d7cb05e3902d7f136f31f843c9e662b87e022335 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 4 Jul 2019 16:24:21 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=A0=91DEMO=20=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 3b79ccc..f568f5f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -109,6 +109,20 @@ public class CoreHqlPack { return result; } + /** + * 岗位复杂查询 + * @param position + * @return + */ + public static DdlPackBean packHqlSysPositionList(SysPosition position){ + DdlPackBean result = new DdlPackBean(); + + // 查询参数封装 + DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + + return result; + } + /** * 组织复杂查询 From fe3d392e9bb565c6c79f013a0fe289e3ab9055e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 4 Jul 2019 16:44:32 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=E5=86=97=E4=BD=99=E4=B8=BB=E8=A1=A8=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E5=AD=97=E6=AE=B5=20=E6=96=B0=E5=A2=9E=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 12 +++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 +++ .../pojo/wms/engine/rule/GenerateSnRule.java | 40 ++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.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 457faaa..efc08fa 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 @@ -2853,4 +2853,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * ERP同步标识 10=待同步，20=同步成功，30=同步失败 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_SN_GENERATE_RULE { + SOURCE(10, "源"), TARGET(20, "目标"), NON_ASSIGNMENT(30, "不赋值"); + + private int value; + private String description; + + WMS_SN_GENERATE_RULE(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; + } + } } \ No newline at end of file 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 d9563fd..9c8029d 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 @@ -210,4 +210,16 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; + + @Transient + @ApiParam("移动类型") + public Integer moveType; + + @Transient + @ApiParam("业务类型") + public Integer busiType; + + @Column(name = "IS_SN") + @ApiParam(value = "条码生成状态", example = "1") + public Integer isSn; } 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 61c8310..0c1b599 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 @@ -151,6 +151,10 @@ public class WmsPart extends BaseBean { @ApiParam("库存水平") private String stockLevelStatus; + @Column(name = "IS_PROD_LOT") + @ApiParam(value = "是否录入生产批次", example = "1") + private Integer isProdLot; + public int getIqcValue(){ return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java new file mode 100644 index 0000000..8d22953 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.wms.engine.rule; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class GenerateSnRule { + /** + * 业务类型 130 + */ + private Integer busiType; + + /** + * 是否允许生成条码 + */ + private Integer isGenerateSn; + + /** + * 条码状态 + */ + private Integer snStatus; + + /** + * 质量状态 + */ + private Integer qcStatus; + + /** + * 仓库来源 + */ + private Integer whSource; + + /** + * 存储区来源 + */ + private Integer zoneSource; +} From 58b067e3cc3255da162a4101b5b903eea5ede45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 4 Jul 2019 19:18:07 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E7=BA=A7=E8=81=94=E5=AD=90=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=8C=BA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b93df5e..6ed71d6 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 @@ -502,8 +502,8 @@ public class WmsEnumUtil { SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"), NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), - LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"); - + LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"), + AMPR(190, "AMPR", "AMPR"); private int value; private String code; @@ -2868,6 +2868,7 @@ public class WmsEnumUtil { ASSIST("ASSIST", "辅助"), NC("NC", "NC"), CS("CS", "盘点"); + private String value; private String description; 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 b3feab4..d7c0a9d 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 @@ -36,7 +36,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "ASN_TYPE") @ApiParam("单据类型") - public String asnType; + public Integer asnType; @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") 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 4c690e0..649ae75 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 库存信息 @@ -126,6 +127,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "总数量") private Double totalQty; + @Transient + @ApiParam(value = "存储区集合") + private List zoneList; + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } 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 f17e87e..f42fcb0 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 @@ -521,7 +521,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); + DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnType(), "asnType", result); DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); @@ -821,9 +821,9 @@ public class WmsHqlPack { public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result); //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); From 8f182f962d3d678a2fbe7799bbe205283e11e2dc Mon Sep 17 00:00:00 2001 From: Chnx Date: Thu, 4 Jul 2019 20:27:48 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 40 ++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 86 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 32 ++++++++ 3 files changed, 158 insertions(+) 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 3c78462..2abe9b4 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 @@ -124,6 +124,18 @@ public class WmsMoveDetails extends BaseBean { @Transient private Long finishedCounts; + @Transient + @ApiParam("交易类型") + private String transTypeCode; + + @Transient + @ApiParam("erp库存地") + private String ZoneNo; + + @Transient + @ApiParam("条码") + private String sn; + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -148,4 +160,32 @@ public class WmsMoveDetails extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + + public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode, + Integer itemStatus,String unit,String srcWhNo, + String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo, + Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){ + this.organizeCode = organizeCode; + this.partNo = partNo; + this.orderNo = orderNo; + this.item = item; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.srcLocateNo = srcLocateNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.refSrc = refSrc; + this.vendorNo = vendorNo; + this.custNo = custNo; + + + + } } 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 e88ab0d..f5d2080 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 @@ -65,4 +65,90 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "业务类型编码") private Integer busiTypeCode; + + @Transient + @ApiParam("物料编码") + private String partNo; + + @Transient + @ApiParam("状态") + private Integer itemStatus; + + @Transient + @ApiParam("erp库存地") + private String ZoneNo; + + @Transient + @ApiParam("关联单号") + private String refSrc; + + @Transient + @ApiParam("目标仓库") + private String destWhNo; + + @Transient + @ApiParam("存储区") + private String destZoneNo; + + @Transient + @ApiParam("供应商编码") + private String vendorNo; + + @Transient + @ApiParam("条码") + private String sn; + + @Transient + @ApiParam("物料名称") + private String partNameRdd; + + @Transient + @ApiParam("单位") + private String unit; + + @Transient + @ApiParam("源仓库") + private String srcWhNo; + + @Transient + @ApiParam("源存储区代码") + private String srcZoneNo; + + @Transient + @ApiParam("处理数量") + private Double transQty; + + @Transient + @ApiParam("不合格处理数量") + private Double rejectQty; + + @Transient + @ApiParam("库位") + private String destLocateNo; + + + public WmsMoveMaster(){}; + + public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,Integer itemStatus, + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + + + } + + + + + } 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 5b262dc..884cae5 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 @@ -165,6 +165,14 @@ public class WmsMoveSn extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Transient + @ApiParam("erp库存地") + private String ZoneNo; + + @Transient + @ApiParam("供应商编码") + private String vendorNo; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ @@ -196,4 +204,28 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } + public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, + String transTypeCode,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, + Integer destSnStatus, String lotNo,String dateCode){ + this.organizeCode=organizeCode; + this.orderNo=orderNo; + this.item=item; + this.partNo=partNo; + this.partNameRdd=partNameRdd; + this.transTypeCode=transTypeCode; + this.itemStatus=itemStatus; + this.unit=unit; + this.srcLocateNo=srcLocateNo; + this.destLocateNo=destLocateNo; + this.srcQty=srcQty; + this.srcQty=srcQty; + this.destQty=destQty; + this.srcQcStatus=srcQcStatus; + this.descQcStatus=descQcStatus; + this.srcSnStatus=srcSnStatus; + this.destSnStatus=destSnStatus; + this.lotNo=lotNo; + this.dateCode=dateCode; + +} } From 71087e5d43f6d99625098ed09dc270d76ab52ff2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Jul 2019 20:47:45 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index f568f5f..641f8b3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; import java.util.List; +import java.util.stream.Collectors; /** * @Description : 平台对象封装 @@ -146,6 +147,17 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + DdlPackBean result = new DdlPackBean(); + + // String Like + DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result); + // Number In + DdlPreparedPack.getInPackList(idList,"id",result); + return result; + } + public static String packHqlSysOrganize(Long[] ids, Integer typeId){ StringBuffer result = new StringBuffer(); @@ -784,4 +796,18 @@ public class CoreHqlPack { return ddlPackBean; } + + /** + * 查询当前用户所有组织数据 + * @param sysRefUserDepartments + * @return + */ + public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean); + + return packBean; + } } \ No newline at end of file