From cf96de80432557e620e5582e00e5bcf0392f5581 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Jul 2019 16:13:02 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?UTF-8?q?=E6=A0=91DEMO=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=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 4/4] =?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; +}