From e4600e1c01ef5205fed2da0e4557e0bd504878c0 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 12 Mar 2019 16:59:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 20 ++++++++++++++++++++ 1 file changed, 20 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 c22bdc9..958a11f 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 @@ -1846,6 +1846,16 @@ public class WmsEnumUtil { 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 String getDescription() { return description; } @@ -1882,5 +1892,15 @@ public class WmsEnumUtil { 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; + } } } From e1825eac407473e7d86d727cce07b2d01c3a3ba8 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 12 Mar 2019 17:40:06 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6ALL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 41 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 --- 2 files changed, 41 insertions(+), 4 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 c22bdc9..beb3cb1 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 @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @Modify: **/ public class WmsEnumUtil { + /** * 拆分规则 */ @@ -1883,4 +1884,44 @@ public class WmsEnumUtil { return description; } } + + /** + * 库存交易记录生成标记 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRANS_QUAN_GENERAL_TAG { + MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负"); + + private String code; + private String description; + int value; + + TRANS_QUAN_GENERAL_TAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static TRANS_QUAN_GENERAL_TAG codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + return values()[i]; + } + } + return null; + } + } } 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 2755a0e..6d6e141 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 @@ -101,8 +101,4 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "PRIORITY") @ApiParam(value = "优先级", example = "1") public Integer priority; - - @Transient - @ApiParam(value = "移库单明细集合") - private List wmsDocMovementDetailsList; } From d6def493e48e9ff711080056c1868ebd9aa45bba Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 12 Mar 2019 18:13:38 +0800 Subject: [PATCH 03/12] =?UTF-8?q?bean=E4=BF=AE=E6=94=B9=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5pdm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 10 +++++++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 8 ++++++-- 9 files changed, 33 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index ccbbfea..e0d2b87 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -28,16 +28,16 @@ import javax.persistence.Table; @Api("工厂仓库信息") public class WareHouse extends BaseBean { - @Column(name="CODE") + @Column(name="WM_NO") @ApiParam("仓库代码") - public String code; + public String wmNo; - @Column(name="NAME") + @Column(name="WM_NAME") @ApiParam("仓库名称") - public String name; + public String wmName; - @Column(name="ADDRESS") + @Column(name="WM_ADDR") @ApiParam("仓库地址") - public String address; + public String wmAddr; } 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 5586f68..3e6ecc4 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 @@ -43,4 +43,8 @@ public class WmsActionModule extends BaseBean { @Column(name="AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; + + @Column(name="OP_TYPE_CODE") + @ApiParam(value = "作业类型", example = "0") + public Integer opTypeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index 627176c..3aeca7d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -63,7 +63,7 @@ public class WmsCheckFactRecord extends BaseBean { @Column(name="REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name="PLAN_QTY") @ApiParam(value = "应收数量", example = "0") 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 2831670..2020250 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 @@ -62,7 +62,7 @@ public class WmsMoveSn extends BaseBean { @Column(name="REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name="LOT_NO") @ApiParam("批次编号") @@ -132,6 +132,14 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "目的条码状态", example = "1") public Integer destSnStatus; + @Column(name="DATE_CODE") + @ApiParam("生产日期") + public String dateCode; + + @Column(name="FIX_LOT_NO") + @ApiParam("特殊批次") + public String fixLotNo; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 5639e4c..1583f39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -61,7 +61,7 @@ public class WmsQCDetails extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name = "FACT_QTY") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 59bb3ef..9663b9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name = "CUSTOMER_NO") @ApiParam("客户编号") 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 a35f07d..d34efd0 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 @@ -52,6 +52,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam("单位") public String unit; + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + @Column(name = "QTY") @ApiParam(value = "可用数量", example = "0") public Double qty; 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 b1b7c0c..a4a7b00 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 @@ -46,7 +46,7 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") - public String reMark; + public String remark; /** * 状态:1=创建,10=待处理,20=已处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 9b80d12..f858769 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -45,11 +45,11 @@ public class WmsTransQuan extends BaseBean { private String locateNo; @Column(name = "PART_NO") - @ApiParam(value = "零件编号") + @ApiParam(value = "物料编码") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam(value = "零件名称") + @ApiParam(value = "物料名称") private String partNameRdd; @Column(name = "UNIT") @@ -95,4 +95,8 @@ public class WmsTransQuan extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; } From 307f07e7ed00349077761012d15b4af5a804efc1 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Mar 2019 18:37:37 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=BE=AE=E6=9C=8D=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysBarcodeRule.java | 52 ++++++++++++++++++++++ .../i3plus/pojo/platform/bean/SysOrderNoRule.java | 2 +- .../repository/SysBarcodeRuleRepository.java | 14 ++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 30 +++++++++++++ 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java new file mode 100644 index 0000000..61c82cc --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 条码解析规则 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-03-12 14:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_BARCODE_RULE") +@Api(value="条码规则",description = "条码规则") +public class SysBarcodeRule extends BaseBean { + + @Column(name = "NAME") + @ApiParam(value = "规则名称") + private String name; + + @Column(name = "BARCODE_RULE_CODE") + @ApiParam(value = "规则代码") + private String barcodeRuleCode; + + @Column(name = "BARCODE_RULE") + @ApiParam(value = "条码规则") + private String barcodeRule; + + @Column(name = "BARCODE_SEPARATOR") + @ApiParam(value = "条码分隔符") + private String barcodeSeparator; + + @Column(name="BARCODE_RULE_DESCRIPTION") + @ApiParam(value ="条码规则描述") + private String barcodeRuleDescription; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 89e9d29..258e35d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -41,7 +41,7 @@ public class SysOrderNoRule extends BaseBean { @ApiParam(value = "规则代码") private String orderNoRuleCode; - @Column(name = "numberRule") + @Column(name = "ORDER_NO_RULE") @ApiParam(value = "单号规则") private String orderNoRule; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java new file mode 100644 index 0000000..d1fd285 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; + +/** + * @Description : 条码规则 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-03-12 16:02 + * @Modify: + **/ +public interface SysBarcodeRuleRepository extends BaseRepository { +} 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 98afcba..dd792df 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 @@ -635,4 +635,34 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 条码规则代码是否存在 + * @param sysBarcodeRule + * @return + */ + public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + // not + HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result); + + return result.toString(); + } + + /** + * 条码规则复杂查询 + * @param sysBarcodeRule + * @return + */ + public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result); + HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + + return result.toString(); + } } \ No newline at end of file From 56568be77e6ff3ce026aaca75ad1ebdbd43f9a2d Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 12 Mar 2019 18:47:28 +0800 Subject: [PATCH 05/12] =?UTF-8?q?bean=E4=BF=AE=E6=94=B9=20WmsHqlPack=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5pdm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 760566e..cc715fa 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 @@ -309,9 +309,9 @@ public class WmsHqlPack { public static String packHqlWareHouse(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + HqlPack.getStringLikerPack(wareHouse.getWmAddr(), "wmAddr", result); + HqlPack.getStringLikerPack(wareHouse.getWmNo(), "wmNo", result); + HqlPack.getStringLikerPack(wareHouse.getWmName(), "wmName", result); getStringBuilderPack(wareHouse, result); @@ -368,8 +368,8 @@ public class WmsHqlPack { public static String packHqlWareHouseUnique(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); + HqlPack.getStringEqualPack(wareHouse.getWmName(), "wmName", result); + HqlPack.getStringEqualPack(wareHouse.getWmNo(), "wmCode", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); @@ -645,7 +645,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); getStringBuilderPack(wmsTaskInfo, result); From 24b38fefb057bbf3931e19deebd28ca52d41ffa4 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 13 Mar 2019 09:04:21 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 +++++++++++++++++++++- 1 file changed, 72 insertions(+), 2 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 c22bdc9..4824e46 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 @@ -957,6 +957,40 @@ public class WmsEnumUtil { } /** + * 库存条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_QUALITY_STATUS { + NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离"); + + private int value; + private String description; + + SN_QUALITY_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; + } + } + + /** * 业务表：库存条码状态 * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @@ -968,8 +1002,9 @@ public class WmsEnumUtil { INSTOCKED(30, "入库"), PICKED(40, "配料"), OUT_STOCK(50, "出库"), - SCRAPED(60, "报废"), - COMMING(70, "在途"); + FRAZE(60, "冻结"), + SCRAPED(70, "报废"), + COMMING(80, "在途"); private int value; private String description; @@ -1239,6 +1274,41 @@ public class WmsEnumUtil { } } + /** + * 库存移动单明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_DETAIL_STATUS { + CREATE(10, "创建"), + BE_HANDLE(20, "待处理"), + FINISH(30, "已处理"); + + private int value; + private String description; + + MOVE_DETAIL_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; + } + } /** * 质检业务类型 From c0be6489a36202050a488a17544192e8180eb426 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Wed, 13 Mar 2019 09:14:12 +0800 Subject: [PATCH 07/12] =?UTF-8?q?bean=E4=BF=AE=E6=94=B9=20Warehouse=20?= =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=BA=E5=8E=9F=E6=9D=A5=E7=9A=84code=20?= =?UTF-8?q?=E3=80=81=20name=20=E3=80=81address?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index e0d2b87..ccbbfea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -28,16 +28,16 @@ import javax.persistence.Table; @Api("工厂仓库信息") public class WareHouse extends BaseBean { - @Column(name="WM_NO") + @Column(name="CODE") @ApiParam("仓库代码") - public String wmNo; + public String code; - @Column(name="WM_NAME") + @Column(name="NAME") @ApiParam("仓库名称") - public String wmName; + public String name; - @Column(name="WM_ADDR") + @Column(name="ADDRESS") @ApiParam("仓库地址") - public String wmAddr; + public String address; } 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 cc715fa..c373f02 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 @@ -309,9 +309,9 @@ public class WmsHqlPack { public static String packHqlWareHouse(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wareHouse.getWmAddr(), "wmAddr", result); - HqlPack.getStringLikerPack(wareHouse.getWmNo(), "wmNo", result); - HqlPack.getStringLikerPack(wareHouse.getWmName(), "wmName", result); + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); getStringBuilderPack(wareHouse, result); @@ -368,8 +368,8 @@ public class WmsHqlPack { public static String packHqlWareHouseUnique(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wareHouse.getWmName(), "wmName", result); - HqlPack.getStringEqualPack(wareHouse.getWmNo(), "wmCode", result); + HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); + HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); From 093a67f5411898dd04a8018f1e44dd2f12a0be5e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 13 Mar 2019 10:44:58 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=A7=A3=E6=9E=90Demo=20=E5=85=83=E7=B4=A0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index db477bd..22e016a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -165,4 +165,20 @@ public class ReportHqlPack { return result.toString(); } + + /** + * 元素名称是否存在 + * @param brElement + * @return + */ + public static String packHqlBrElementName(BrElement brElement){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(brElement.getElementName(),"elementName",result); + // not + HqlPack.getNumNOEqualPack(brElement.getId(),"id",result); + + return result.toString(); + } } From a8736a4747f356112b9d079a972f570e60056eec Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Wed, 13 Mar 2019 20:39:26 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=81=E6=9F=A5=E8=AF=A2=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsDataAuthModel.java | 66 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 23 ++++++++ 2 files changed, 89 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java new file mode 100644 index 0000000..41ce948 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.util.List; + +/** + * @Description : 单据Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-07 19:18 + * @Modify: + **/ +@Data +@Api("数据权限Model") +public class WmsDataAuthModel extends BaseBean { + + @ApiParam("角色编号") + private String roleCode; + + @ApiParam("数据对象") + private String dataObj; + + @ApiParam("数据对象值") + private String dataObjValue; + + @ApiParam("物料列表") + private List partList; + + @ApiParam("库位列表") + private List locateList; + + @ApiParam("仓库列表") + private List whList; + + @ApiParam("存储区列表") + private List zoneList; + + @ApiParam( + value = "新增操作", + example = "0" + ) + private Integer addOp; + + @ApiParam( + value = "删除操作", + example = "0" + ) + private Integer delOp; + + @ApiParam( + value = "修改操作", + example = "0" + ) + private Integer updOp; + + @ApiParam( + value = "查询操作", + example = "0" + ) + private Integer queryOp; +} 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 c373f02..2bfbed9 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 @@ -1400,4 +1400,27 @@ public class WmsHqlPack { getStringBuilderPack(bean, result); return result.toString(); } + + /** + * 根据条件查询dataAuth + * @param wmsDataAuth + * @return + */ + public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { + StringBuffer result = new StringBuffer(); + if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){ + HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result); + } + if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){ + HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result); + } + if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())){ + HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(),"dataObj",result); + } + if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())){ + HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(),"dataObjValue",result); + } + getStringBuilderPack(wmsDataAuth, result); + return result.toString(); + } } From 41a1cc46e876d52866a8dec09f82a288b63a06de Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 14 Mar 2019 11:32:19 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?= 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 ++--- 1 file changed, 2 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 ca1763a..9571e6f 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 @@ -1003,9 +1003,8 @@ public class WmsEnumUtil { INSTOCKED(30, "入库"), PICKED(40, "配料"), OUT_STOCK(50, "出库"), - FRAZE(60, "冻结"), - SCRAPED(70, "报废"), - COMMING(80, "在途"); + FRAZE(60, "报废"), + COMMING(70, "在途"); private int value; private String description; From 8a58b48826de8b229f507de613944e92d1823437 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 14 Mar 2019 11:55:55 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E6=8E=89=E7=89=A9=E6=96=99=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 12 ------------ 1 file changed, 12 deletions(-) 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 6d6e141..ec2dbfd 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 @@ -82,18 +82,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - @Column(name = "PART_NO") - @ApiParam(value = "物料编码") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam(value = "物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam(value = "数量", example = "1") - private Double qty; - @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; From 11a2a729174bab648351f93e3eca3495312dcde8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 14 Mar 2019 18:16:21 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=A6=81=E7=94=A8=E3=80=81=E5=90=AF=E7=94=A8=E3=80=81?= =?UTF-8?q?=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 42 ++++++++++++++++++++++ 1 file changed, 42 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 9571e6f..0240ccf 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 @@ -2013,4 +2013,46 @@ public class WmsEnumUtil { return null; } } + + /** + * 数据状态 + * 1 启用 + * 2 禁用 + * 3 全部 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_STATUS { + ENABLE(1, "启用"), + DISABLE(2, "禁用"), + LOCKING(3, "全部"); + + private int value; + private String description; + + DATA_STATUS() { + } + + DATA_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } }