From 945ef828671ab535b3a9e5c5c9a3d6d60803f71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 25 Jun 2019 16:22:48 +0800 Subject: [PATCH 01/99] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?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/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index dd5eee0..23eb182 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -219,6 +219,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP库存地集合") public List erpZoneNoList; + @Transient + @ApiParam(value = "ERP库存地") + public String erpZoneNo; + public WmsStockSn(){} From 48589a10cb5932c78022171100c193fd8b8c5f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 25 Jun 2019 19:27:11 +0800 Subject: [PATCH 02/99] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=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/SapBase.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 7d7156b..66fd04c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -34,7 +34,7 @@ public class SapBase { private String rechms; @ApiParam(value = "同步标志", example = "-1") - private String synflg = "Y"; + private String synflg = "N"; @ApiParam(value = "同步日期", example = "-1") private String synymd; @@ -43,7 +43,7 @@ public class SapBase { private String synhms; @ApiParam(value = "处理标志", example = "-1") - private String actflg = "Y"; + private String actflg = "N"; @ApiParam(value = "处理日期", example = "-1") private String actymd; @@ -52,7 +52,7 @@ public class SapBase { private String acthms ="00:00:00"; @ApiParam(value = "状态标志", example = "-1") - private String staflg = "Y"; + private String staflg = "N"; @ApiParam(value = "顺序号", example = "-1") private Integer seq = 1; @@ -62,11 +62,13 @@ public class SapBase { public String getSynymdTime() { SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); - return format.format(new Date()); + //format.format(new Date()) + return ""; } public String getSynhmsTime() { SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); - return format.format(new Date()); + //format.format(new Date()) + return ""; } } From 7c28110bd410a1fb1da8a10e5f16e7ba69c310f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 26 Jun 2019 10:31:11 +0800 Subject: [PATCH 03/99] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BF=98=E4=BA=86?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9181e8a..558edbe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public String item; + public Integer item; @Column(name="PART_NO") @ApiParam("物料编码") From af7e8d7a4384e95c8d37ddbad8fe15315c3cf305 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Wed, 26 Jun 2019 12:01:16 +0800 Subject: [PATCH 04/99] =?UTF-8?q?=E7=BB=84=E7=BB=87=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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 fc513e2..2223392 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 @@ -1929,8 +1929,10 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); - DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + if(wmsProdCfgType != null){ + DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); + DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + } DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // getStringBuilderPack(wmsProdCfgType, result); From 484c5942e82248f07f1af59ba9c4af31012e3d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 26 Jun 2019 14:10:33 +0800 Subject: [PATCH 05/99] =?UTF-8?q?=E6=89=80=E6=9C=89=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=8D=AEItem=E5=B1=9E=E6=80=A7=E9=83=BD=E7=94=A8Strin?= =?UTF-8?q?g=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) 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 c734ff1..3679498 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 @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import java.util.List; /** * @Description : ASN订单明细信息 @@ -45,7 +44,7 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index 57d4028..7fb224c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -35,7 +35,7 @@ public class WmsCSAdjustRange extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name="IS_ADJUST") @ApiParam(value = "调整标识", example = "1") @@ -62,7 +62,7 @@ public class WmsCSAdjustRange extends BaseBean { public String unit; public WmsCSAdjustRange(){} - public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) { + public WmsCSAdjustRange(String orderNo, String item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) { this.orderNo = orderNo; this.item = item; this.isAdjust = isAdjust; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index e7018f3..23dca00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -39,7 +39,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 0f24114..970a44f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -34,7 +34,7 @@ public class WmsCSRange extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "PART_NO") @ApiParam("物料编码") 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 67377b4..d9563fd 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 @@ -41,7 +41,7 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 558edbe..9181e8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name="PART_NO") @ApiParam("物料编码") 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 d7e8232..5204005 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 @@ -39,7 +39,7 @@ public class WmsQCDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index e7610a3..b8f29c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -35,7 +35,7 @@ public class WmsQCTrans extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public Integer item; + public String item; /** * 状态:1=创建,10=已处理 From 05c56e46b4dfa857a89ead927f1a8a59d56aa82b Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Wed, 26 Jun 2019 16:00:32 +0800 Subject: [PATCH 06/99] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 26 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 19 ++++++++++++++++ .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) 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 caf74ae..af67eec 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 @@ -2638,4 +2638,30 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 包装类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_LEVEL_STATUS { + LOW("LOW", "低于最低库存"), + HIGH("HIGH", "高于最高库存"), + NORMAL("NORMAL", "安全库存"); + + private String code; + private String description; + + STOCK_LEVEL_STATUS(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } \ No newline at end of file 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 5335318..110155d 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :物料实体 @@ -126,4 +127,22 @@ public class WmsPart extends BaseBean { @Column(name="OUT_CLOSE_FLAG") @ApiParam("項目结算标识") private String outCloseFlag; + + @Transient + @ApiParam("总数量") + private Double qty; + + @Transient + @ApiParam("库存水平") + private String stockLevelStatus; + + public WmsPart(){} + + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){ + this.partNo = partNo; + this.partName = partName; + this.max = maxQty; + this.min = minQty; + this.qty = cqty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index e380985..0c43dd0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -69,7 +69,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable Date: Wed, 26 Jun 2019 16:12:39 +0800 Subject: [PATCH 07/99] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20=E4=BB=BB=E5=8A=A1=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index 9344e2d..beffb73 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.common; import lombok.Data; +import java.util.LinkedHashMap; /** * @Description : @@ -16,4 +17,6 @@ public class ExportDataModel { private String exportData; + private LinkedHashMap exportCol; + } From 3cc4aec00a00c2161e2427eecbb998151adf6782 Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Wed, 26 Jun 2019 16:15:57 +0800 Subject: [PATCH 08/99] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 +++++----- 1 file changed, 5 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 3c8359b..da720a0 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 @@ -2657,16 +2657,16 @@ public class WmsEnumUtil { HIGH("HIGH", "高于最高库存"), NORMAL("NORMAL", "安全库存"); - private String code; + private String value; private String description; - STOCK_LEVEL_STATUS(String code, String description) { - this.code = code; + STOCK_LEVEL_STATUS(String value, String description) { + this.value = value; this.description = description; } - public String getCode() { - return code; + public String getValue() { + return value; } public String getDescription() { From d91c9138b34f5936561c68032a54a2a2ae388eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 26 Jun 2019 16:42:10 +0800 Subject: [PATCH 09/99] =?UTF-8?q?=E5=AD=97=E6=AE=B5=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/WmsStockSn.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 49df331..23eb182 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -151,10 +151,6 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "客户条码") private String custSn; - @Column(name = "ERP_ZONE_NO") - @ApiParam(value = "ERP库存地") - public String erpZoneNo; - @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 4a4a50638cc7bb3fc9428ecb58ce26369567cf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Jun 2019 18:45:15 +0800 Subject: [PATCH 10/99] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 119 +++++++++++++++++++++ .../wms/repository/WmsDocFgDetailRepository.java | 17 +++ 2 files changed, 136 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocFgDetailRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java new file mode 100644 index 0000000..b8178a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -0,0 +1,119 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS_产品报工明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-26 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOC_FG_DETAIL") +@Api("WMS_产品报工明细信息") +public class WmsDocFgDetail extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="WO_NO") + @ApiParam("ERP工单号") + public String woNo; + + @Column(name="LINE_NO") + @ApiParam("生产线") + public String lineNo; + + @Column(name="COMMIT_TIME") + @ApiParam("提交日期") + public String commitTime; + + @Column(name="MFG_LOG_NO") + @ApiParam("生产批次") + public String mfgLocNo; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name="PART_NO") + @ApiParam(value = "物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("单位") + public String partNameRdd; + + @Column(name="BOM_UPDATE") + @ApiParam("BOM切换标识") + public String bomUpdate; + + @Column(name="QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="IN_AREA_NO") + @ApiParam("入库ERP库存地") + public String inAreaNo; + + @Column(name="ITEM_PART_NO") + @ApiParam("子物料号") + public String itemPartNo; + + @Column(name="ITEM_PART_NAME") + @ApiParam("子料物料描述") + public String itemPartName; + + @Column(name="ITEM_UNIT") + @ApiParam("子计量单位") + public String itemUnit; + + @Column(name="ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子用量", example = "0") + public Double itemQty; + + @Column(name="OUT_AREA_NO") + @ApiParam("消耗ERP库存地") + public String outAreaNo; + + @Column(name="SID") + @ApiParam("SID") + public String sid; + + /** + * 状态:10=新建,20=已处理,30=处理出错 + */ + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 + */ + @Column(name="SRC") + @ApiParam("单据来源") + public String src; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocFgDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocFgDetailRepository.java new file mode 100644 index 0000000..a52a5e8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocFgDetailRepository.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.BasCustomer; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocFgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description :WMS_产品报工明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-26 16:03 + * @Modify: + **/ +@Repository +public interface WmsDocFgDetailRepository extends BaseRepository { +} From 400b380b554d47b444b911e096a6c3ff2cc2b393 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Wed, 26 Jun 2019 20:58:33 +0800 Subject: [PATCH 11/99] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 31 +++++++++++++++ .../wms/modelbean/WmsMoveUnfinishedOrderModel.java | 46 ++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java 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 86e3fd6..871d13c 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 @@ -63,4 +63,8 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "CAR_NO") @ApiParam(value = "车牌号") private String carNo; + + @Column(name = "BUSI_TYPE_CODE") + @ApiParam(value = "业务类型编码") + private Integer busiTypeCode; } 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 cf9215a..5b262dc 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 @@ -150,6 +150,21 @@ public class WmsMoveSn extends BaseBean { @ApiParam("特殊批次") public String fixLotNo; + + + @Transient + @ApiParam("业务类型编码") + private String busiTypeCode; + + + @Transient + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Transient + @ApiParam("关联单号") + public String refSrc; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ @@ -165,4 +180,20 @@ public class WmsMoveSn extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + + public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode, String transTypeCode, String refSrc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.busiTypeCode = busiTypeCode; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } + public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java new file mode 100644 index 0000000..7c4f4f1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -0,0 +1,46 @@ +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; + +/** + * @author Yerik Stone + * @description WmsMoveUnfinishedOrderModel + * @date 2019/6/26 + */ +@Data +@Api("未完成订单模型") +public class WmsMoveUnfinishedOrderModel extends BaseBean{ + + + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("未完成数量") + private Double destQty; + + @ApiParam("业务类型") + private Integer busiTypeCode; + + @ApiParam("交易类型") + private String transTypeCode; + + @ApiParam("关联单号") + private String refSrc; + + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.busiTypeCode = busiTypeCode; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } +} From 7ac3509f96b05862b47defb832b46c34c509e2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 26 Jun 2019 21:01:43 +0800 Subject: [PATCH 12/99] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?= 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 | 4 +++- 1 file changed, 3 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 2223392..336fe7a 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 @@ -1129,7 +1129,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); - + if(wmsStockSn.getIsValid()!= null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); + } getStringBuilderPack(wmsStockSn, result); return result; From a7bfc692fe20681986c269182944228038a14145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 26 Jun 2019 21:02:08 +0800 Subject: [PATCH 13/99] =?UTF-8?q?EXCEL=E6=95=B0=E6=8D=AE=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index beffb73..23a5718 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -17,6 +17,6 @@ public class ExportDataModel { private String exportData; - private LinkedHashMap exportCol; + private String exportCol; } From 299c0c5beee62b206c9501e68e33801fc220f7be Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 26 Jun 2019 21:14:55 +0800 Subject: [PATCH 14/99] =?UTF-8?q?DataObject=20Key=20=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index c631967..b673a6a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -78,6 +78,11 @@ public class BfDataObject extends BaseBean { private List propertyList; @Transient + @ApiParam(value = "数据对象主键") + @AnnoOutputColumn(hidden = true) + private BfDataObjectProperty primaryKey; + + @Transient @ApiParam(value = "数据对象主键属性") @AnnoOutputColumn(hidden = true) private List primaryPropertyList; From 2ce560b39f94ede84268cb0cf482e917ee2f876d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Jun 2019 21:33:04 +0800 Subject: [PATCH 15/99] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9=E5=92=8C?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 7 ++++++ 2 files changed, 33 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 da720a0..26be640 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 @@ -296,6 +296,7 @@ public class WmsEnumUtil { /** * 产品入库，发运状态 + * WMS_产品报工明细信息 ：单据状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { @@ -2673,4 +2674,29 @@ public class WmsEnumUtil { return description; } } + + /** + * 外部接口单据来源枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_STATUS { + ZMMES("ZMMES", "知明MES"), + TBMES("TBMES", "MES接口"); + + private String value; + private String description; + + SRC_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index b8178a7..7b4f672 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -116,4 +116,11 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="SRC") @ApiParam("单据来源") public String src; + + /** + * 是否锁定：1=锁定 2=未锁定 + */ + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock; } From baeb202ca5d26daaaadb0f39d759b97ae8af1c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Wed, 26 Jun 2019 22:04:34 +0800 Subject: [PATCH 16/99] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index dfe7f4c..da71990 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -11,4 +11,12 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; * @Modify: **/ public interface WmsConfigRepository extends BaseRepository { + + /** + * 按照工厂代码和配置代码查询配置信息 + * @param organizeCode 工厂代码 + * @param configCode 配置代码 + * @return 配置信息 + */ + WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); } From 35f92b05e3e999f698ce5688af713b539f12ae83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 27 Jun 2019 13:52:15 +0800 Subject: [PATCH 17/99] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9ERP=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9A=82=E5=AD=98=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) 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 26be640..260845c 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 @@ -602,7 +602,10 @@ public class WmsEnumUtil { IN_STOCK("IN_STOCK", "入库单"), SHIPPING("SHIPPING", "发运单"), QC("QC", "质检"), - CS("CS", "盘点"); + CS("CS", "盘点"), + DR("DR", "直送收货"), + AMPR("AMPR", "AMP拉动收货"); + private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index db6b159..6c4d1c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -136,6 +136,22 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Column(name = "SRC_AREA_NO") + @ApiParam("来源库存地") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目标库存地") + public String destAreaNo; + + @Column(name = "BUSI_TYPE_CODE") + @ApiParam("交易类型") + public Integer busiTypeCode; + + @Column(name = "IS_SYNC") + @ApiParam("是否同步") + public Integer isSync; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From c783d9119c7c19d3e56cf33d9d83f951e390e8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 27 Jun 2019 14:42:41 +0800 Subject: [PATCH 18/99] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9F=A5=E5=87=BA=E4=BA=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA30=E7=9A=84=E4=BB=BB=E5=8A=A1+=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6execute=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E4=BA=8B=E5=8A=A1=E7=BA=A7=E5=88=AB+?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=90=8D=E6=9F=A5=E6=89=BE=E6=9E=9A=E4=B8=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=9A=84=E9=9D=99=E6=80=81=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 +++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) 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 26be640..da1c060 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 @@ -2,6 +2,12 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @Description : * @Reference : @@ -2564,7 +2570,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_TRANS_QUAN_STATUS { - CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败"); + CREATE(1, "创建"), SUCCESS(10, "处理成功"), FAIL(30, "处理失败"); private int value; private String description; @@ -2699,4 +2705,56 @@ public class WmsEnumUtil { return description; } } + + public static Map getEnumByName(String enumName) throws Exception{ + Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class clazz; + Enum[] enumConstants; + + Map enumMap;// 枚举类 + List> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】 + Map value;// 枚举实例属性 + + Method getValue; + Method getCode; + Method getDescription; + + // 遍历内部类 + String simpleName;//内部类的类名 + for (Class class1 : innerClazz) { + //获取内部内的类名 + simpleName = class1.getSimpleName(); + if (simpleName.equals(enumName)) { + // 判断类是不是枚举类 + clazz = (Class) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName); + + // 枚举类方法初始化 + getCode = null; + try { + getCode = clazz.getMethod("getCode"); + } catch (NoSuchMethodException e) { + } + getValue = clazz.getMethod("getValue"); + getDescription = clazz.getMethod("getDescription"); + + // 获取所有枚举实例 + enumConstants = clazz.getEnumConstants(); + enumMap = new HashMap<>(); + values = new ArrayList<>(); + for (Enum enum1 : enumConstants) { + value = new HashMap<>(); + value.put("value", getValue.invoke(enum1)); + if (getCode != null) { + value.put("code", getCode.invoke(enum1)); + } + value.put("description", getDescription.invoke(enum1)); + values.add(value); + } + enumMap.put("enumName", clazz.getSimpleName()); + enumMap.put("valuesList", values); + return enumMap; + } + } + return null; + } } \ No newline at end of file From 31b7e2d8dcf208176074794b7752aa8e72402ab4 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 27 Jun 2019 16:48:44 +0800 Subject: [PATCH 19/99] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=92=8C=E6=9C=AA=E5=AE=8C=E6=88=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8A=A5=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/modelbean/WmsMoveUnfinishedOrderModel.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index 7c4f4f1..66eda83 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -25,21 +25,32 @@ public class WmsMoveUnfinishedOrderModel extends BaseBean{ @ApiParam("未完成数量") private Double destQty; - @ApiParam("业务类型") - private Integer busiTypeCode; + @ApiParam("交易类型") private String transTypeCode; + @ApiParam("交易类型名称") + private String transTypeName; + @ApiParam("关联单号") private String refSrc; - public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.refSrc = refSrc; + } + + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; - this.busiTypeCode = busiTypeCode; this.transTypeCode = transTypeCode; this.refSrc = refSrc; } From 1b4e5143aa26b61f284dd3803a2ab854cbb93480 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 27 Jun 2019 17:24:01 +0800 Subject: [PATCH 20/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=95=E5=B8=90?= =?UTF-8?q?=E5=8F=B7=E5=A4=9A=E5=B9=B3=E5=8F=B0=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 21 +++++++-------------- .../i3plus/pojo/base/shirotoken/AdminToken.java | 4 ++++ .../i3plus/pojo/base/shirotoken/BaseToken.java | 16 ++++++++++++++++ .../i3plus/pojo/base/shirotoken/SaAdminToken.java | 4 ++++ .../i3plus/pojo/base/shirotoken/UserToken.java | 4 ++++ .../i3plus/pojo/platform/bean/SessionUser.java | 2 -- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1280e58..156a405 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -722,20 +722,13 @@ public class CommonEnumUtil { } /** - * 客户端操作系统 - * return "Windows"; - * return "Mac"; - * return "Unix"; - * return "Android"; - * return "IPhone"; + * 客户端登录标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOG_LOGIN_PLATFORM { - WINDOWS(1, "Windows", "Windows 操作系统"), - MAC(2, "Mac", "Mac 操作系统"), - UNIX(3, "Unix", "Linux 操作系统"), - ANDROID(4, "Android", "Android 操作系统"), - IPHONE(5, "IPhone", "IPhone 操作系统"); + PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"), + PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"), + Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"); private int value; private String name; @@ -762,11 +755,11 @@ public class CommonEnumUtil { return name; } - public static String valueOf(int val) { - String tmp = null; + public static LOG_LOGIN_PLATFORM valueOf(int val) { + LOG_LOGIN_PLATFORM tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].getName(); + tmp = values()[i]; } } return tmp; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java index 16eca8d..85dafe5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java @@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken; **/ public class AdminToken extends BaseToken { + public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } + public AdminToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java index 86c236a..2ba35cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java @@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken { private String loginName; private String loginPwd; private String languageCode; + private Integer loginPlatform; public BaseToken(String loginName, String loginPwd, String languageCode) { this.loginName = loginName; @@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken { this.languageCode = languageCode; } + public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + this.loginName = loginName; + this.loginPwd = loginPwd; + this.languageCode = languageCode; + this.loginPlatform = loginPlatform; + } + //身份 @Override public Object getPrincipal() { @@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken { public void setLanguageCode(String languageCode) { this.languageCode = languageCode; } + + public Integer getLoginPlatform() { + return loginPlatform; + } + + public void setLoginPlatform(Integer loginPlatform) { + this.loginPlatform = loginPlatform; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java index 0d4e1fe..8cee322 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java @@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken { public SaAdminToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } + + public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java index 84a10d1..9d6cf59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java @@ -12,4 +12,8 @@ public class UserToken extends BaseToken { public UserToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } + + public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 59baf96..3ee307d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -16,8 +16,6 @@ import java.util.List; @Data public class SessionUser implements Serializable { - private static final long serialVersionUID = 1L; - @ApiParam("用户ID") private Long userId; From 557880ffd2fc1d7f6667af94267285bb9df906b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 27 Jun 2019 17:29:26 +0800 Subject: [PATCH 21/99] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=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/WmsDocFgDetail.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 7b4f672..ac6e53d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -58,7 +58,7 @@ public class WmsDocFgDetail extends BaseBean { public String partNo; @Column(name="PART_NAME_RDD") - @ApiParam("单位") + @ApiParam("物料名称") public String partNameRdd; @Column(name="BOM_UPDATE") @@ -123,4 +123,8 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="IS_LOCK") @ApiParam(value = "是否锁定", example = "2") public Integer isLock; + + @Column(name="REMARK") + @ApiParam("备注") + public String remark; } From e7bd528736ac4be80d0597757a408803817aa35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 27 Jun 2019 17:50:25 +0800 Subject: [PATCH 22/99] =?UTF-8?q?1.=20=E8=AE=BE=E7=BD=AE=20is=5Fsync=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 6c4d1c7..67473bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -148,9 +149,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("交易类型") public Integer busiTypeCode; - @Column(name = "IS_SYNC") + @Column(name = "IS_SYNC", nullable = false) @ApiParam("是否同步") - public Integer isSync; + public Integer isSync = CommonEnumUtil.FALSE; @ApiParam(value = "待出库数量", example = "0") @Transient From 2eba4bb74586b28c7b4934d084561bd7258d0584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 27 Jun 2019 18:08:32 +0800 Subject: [PATCH 23/99] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index e719404..6da63b3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -43,6 +43,14 @@ public class SysFile extends BaseBean { @ApiParam(value ="文件所属模块") private Integer fileSoftType; + public int getFileSoftTypeVal(){ + if(fileSoftType == null){ + return 0; + } + + return fileSoftType.intValue(); + } + @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -83,5 +91,4 @@ public class SysFile extends BaseBean { @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") private Integer downloadNum; - } From 6f41158ecb432a43ad270aba759291178799dfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 27 Jun 2019 20:15:11 +0800 Subject: [PATCH 24/99] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index c777851..f977ae9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -85,4 +85,8 @@ public class WmsShipping extends BaseBean { @Transient @ApiParam(value = "发往地简称") private String flagName; + + @Column(name="AREA_NO") + @ApiParam("ERP库存地") + public String areaNo; } 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 2223392..709c651 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 @@ -2051,4 +2051,18 @@ public class WmsHqlPack { return result; } + /** + * 根据id集合查询生产报工明细表的数据 + * + * @param ids + * @return + */ + public static DdlPackBean packHqlWmsDocFgDetail(List ids) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(ids,"id",result); + + return result; + } } From b98b48e4e5dc0ec6e8a5f99634a9454b74920f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 27 Jun 2019 20:56:45 +0800 Subject: [PATCH 25/99] =?UTF-8?q?SAP=5F=E4=BA=A7=E5=93=81=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=B1=87=E6=80=BB=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 136 +++++++++++++++++++++ .../pojo/wms/repository/SapDocFgSumRepository.java | 17 +++ 2 files changed, 153 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java new file mode 100644 index 0000000..a81ce3d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -0,0 +1,136 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :SAP_产品报工汇总表 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-27 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SAP_DOC_FG_SUM") +@Api("SAP_产品报工汇总表") +public class SapDocFgSum extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="PART_NO") + @ApiParam(value = "物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("单位") + public String partNameRdd; + + @Column(name="QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="ERP_WORK_CENTER") + @ApiParam("ERP_工作中心") + public String erpWorkCenter; + + @Column(name="IN_AREA_NO") + @ApiParam("入库ERP库存地") + public String inAreaNo; + + @Column(name="ITEM_PART_NO") + @ApiParam("子物料号") + public String itemPartNo; + + @Column(name="ITEM_PART_NAME") + @ApiParam("子料物料描述") + public String itemPartName; + + @Column(name="ITEM_UNIT") + @ApiParam("子计量单位") + public String itemUnit; + + @Column(name="ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子用量", example = "0") + public Double itemQty; + + @Column(name="OUT_AREA_NO") + @ApiParam("消耗ERP库存地") + public String outAreaNo; + + /** + * 状态:10=新建,20=已处理,30=处理出错 + */ + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 + */ + @Column(name="SRC") + @ApiParam("单据来源") + public String src; + + /** + * 是否锁定：1=锁定 2=未锁定 + */ + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "BOM生效日期") + @Column(name = "EFF_START_TIME") + private String effStartTime; + + @JsonSerialize(using = ToStringSerializer.class) + @Transient + public Long wdfdId; + + public SapDocFgSum(){} + public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java new file mode 100644 index 0000000..02ebe5d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.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.SapDocFgSum; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-27 20:19 + * @Modify: + **/ +@Repository +public interface SapDocFgSumRepository extends BaseRepository { + +} From 0962b810ce488f3b068b00c88f13421cc17c0869 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 27 Jun 2019 21:42:30 +0800 Subject: [PATCH 26/99] =?UTF-8?q?Json=20=E8=BD=AC=E6=8D=A2=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 102685a..9730fb8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1162,15 +1162,15 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL); -// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME); + STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); +// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); /** * 属性类型值 @@ -1202,7 +1202,12 @@ public class BlockFormEnumUtil { */ private SQL_WHERE defaultWhere; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + /** + * 默认查询关系 + */ + private String defaultValue; + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1210,6 +1215,7 @@ public class BlockFormEnumUtil { this.clzFullName = clzFullName; this.controlType = controlType; this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; } public int getValue() { From 72ef115db879afe9f676645931e85b6432aaa919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 27 Jun 2019 22:03:10 +0800 Subject: [PATCH 27/99] =?UTF-8?q?1.=20=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 23eb182..20a2d07 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -64,25 +64,25 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name = "LOT_NO") + @Column(name = "LOT_NO", nullable = false) @ApiParam("收货日期（批次编码）") - public String lotNo; + public String lotNo = ""; - @Column(name = "DATE_CODE") + @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "生产日期") - public String dateCode; + public String dateCode = ""; - @Column(name = "LEFT_CODE") + @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "有效期") - private String leftCode; + private String leftCode = ""; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "FIX_LOT_NO") + @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") - private String fixLotNo; + private String fixLotNo = ""; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") From f85a0296ae8762825bab4520a5633b75ea10c909 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 27 Jun 2019 22:20:24 +0800 Subject: [PATCH 28/99] =?UTF-8?q?=E5=BC=80=E5=8F=91=20bom=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 0962326..536be05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -90,4 +90,12 @@ public class WmsBom extends BaseBean { public Double getItemQty() { return this.itemQty == null ? 0 : this.itemQty.doubleValue(); } + + public WmsBom(){} + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 23eb182..9d3b5f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "客户条码") private String custSn; + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From c7aca0a94d3e57ec6f0ec3b2433a0b29fab3b892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 28 Jun 2019 11:29:48 +0800 Subject: [PATCH 29/99] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E8=BD=AC=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF+=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?= 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 | 6 ++---- 1 file changed, 2 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 871d13c..e88ab0d 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 @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 库存移动单主表信息 @@ -52,6 +49,7 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "交易类型代码") private String transTypeCode; + @Lob @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") private String errorMessage; From da12d8f6b099d1111cf546e900fb683204cca3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 13:11:54 +0800 Subject: [PATCH 30/99] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index a81ce3d..8641e46 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -110,6 +110,10 @@ public class SapDocFgSum extends BaseBean { @Column(name = "EFF_START_TIME") private String effStartTime; + @Transient + @ApiParam(value = "备注") + private String errorMsg; + @JsonSerialize(using = ToStringSerializer.class) @Transient public Long wdfdId; 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 0e91584..a052d53 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 @@ -1137,6 +1137,17 @@ public class WmsHqlPack { return result; } + public static DdlPackBean packHqlcheckSNInLocate(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + + result.setWhereAppend(result.getWhereAppend()+" and qty > 0 "); + getStringBuilderPack(wmsStockQuan, result); + + return result; + } + /** * 质检单明细信息 查询条件封装 * From 3090b2aaad7fd556b61cb5b26478efc5588b9124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 13:56:09 +0800 Subject: [PATCH 31/99] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index f977ae9..54d19f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -78,6 +78,10 @@ public class WmsShipping extends BaseBean { @ApiParam("特殊发货标志") public String shippingFlag; + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + public String shippingTime; + @Transient @ApiParam(value ="客户简称") private String custName; @@ -89,4 +93,20 @@ public class WmsShipping extends BaseBean { @Column(name="AREA_NO") @ApiParam("ERP库存地") public String areaNo; + + @Column(name="CAR_NO") + @ApiParam("车号") + public String carNo; + + @Column(name="ERROR_MESSAGE") + @ApiParam("错误信息") + public String errorMessage; + + @Column(name="IS_LOCK") + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + public Integer isLock; + + @Column(name="ERP_SYNC_FLAG") + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + public Integer erpSyncFlag; } From 1b569ff3a8afc174bb6da3f2374c32e93072ce38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 14:56:20 +0800 Subject: [PATCH 32/99] =?UTF-8?q?ERP=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= 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 1037ff2..f4a090c 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 @@ -2760,4 +2760,38 @@ public class WmsEnumUtil { } return null; } + + /** + * ERP同步标识 10=待同步，20=同步成功，30=同步失败 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_ERP_SYNC_FLAG { + CREATE(10, "待同步"), SUCCESS(20, "同步成功"), FAIL(30, "同步失败"); + + private int value; + private String description; + + WMS_ERP_SYNC_FLAG(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 From 16301be9dccffe1077341005140c270dfeb7b99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 16:58:39 +0800 Subject: [PATCH 33/99] =?UTF-8?q?JOB=E5=BC=80=E5=8F=91=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 112 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 3 + .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 13 +++ .../pojo/wms/repository/AmpJisRecRepository.java | 16 +++ 4 files changed, 144 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java new file mode 100644 index 0000000..55ddac9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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.ColumnDefault; +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 : amy + * @CreateDate : 2019-06-28 15:12 + * @Modify: + **/ +@Data +@Entity +@Table(name="AMP_JIS_REC") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="AMP_JIS收货",description = "AMP_JIS收货") +public class AmpJisRec extends BaseBean{ + + @Column(name="ORDER_NO") + @ApiParam("JIS单号") + public String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + /** + * 状态:10=新建,20=已处理,30=处理出错 + */ + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer orderStatus; + + @Column(name="VENDOR_NO") + @ApiParam(value = "g供应商编码", example = "10") + public Integer vendorNo; + + @Column(name="REMARK") + @ApiParam("备注") + public String remark; + + @Column(name="SRC") + @ApiParam("单据来源") + public String src; + + @Column(name="SHIPPING_FLAG") + @ApiParam("特殊发货标志") + public String shippingFlag; + + @Column(name="ERROR_MESSAGE") + @ApiParam("错误信息") + public String errorMessage; + + @Column(name="AREA_NO") + @ApiParam("ERP库存地") + public String areaNo; + + @Column(name="CAR_NO") + @ApiParam("车号") + public String carNo; + + @Column(name="VIN") + @ApiParam("VIN号") + public String vin; + + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + public String shippingTime; + + @Column(name="SID") + @ApiParam("sid") + public String sid; + + @Column(name="IS_LOCK") + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + public Integer isLock; + + @Column(name="ERP_SYNC_FLAG") + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + public Integer erpSyncFlag; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 67473bd..5b44eb5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -161,6 +161,9 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long finishedCounts; + @Transient + private Long shippingId; + public Double getRejectQty(){ return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 54d19f6..559b83e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -109,4 +109,17 @@ public class WmsShipping extends BaseBean { @Column(name="ERP_SYNC_FLAG") @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) public Integer erpSyncFlag; + + public WmsShipping(){} + + public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) { + this.id = id; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.custNo = custNo; + this.carNo = carNo; + this.areaNo = areaNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java new file mode 100644 index 0000000..daf24d9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.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.AmpJisRec; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface AmpJisRecRepository extends BaseRepository { +} From 31f6f4deeff53c80c571dcb0196797621b7e7070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 28 Jun 2019 17:03:27 +0800 Subject: [PATCH 34/99] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9EAMP=20ASN=E4=B8=BB=E8=A1=A8=E3=80=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E5=B7=A5=E6=98=8E=E7=BB=86=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B1=9E=E6=80=A7=20hql=E6=9F=A5=E8=AF=A2ASN=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 8 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 +++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++++++++++++++++++ 4 files changed, 36 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 1037ff2..d515dd1 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 @@ -94,7 +94,8 @@ public class WmsEnumUtil { REG(10, "REG", "原物料采购"), SUB(20, "SUB", "委外采购"), TAR(30, "TAR", "多角贸易采购"), - TAP(40, "TAP", "多角代采购"); + TAP(40, "TAP", "多角代采购"), + AMP(50, "AMP", "AMP拉动"); private int value; private String code; 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 b1ff4f5..0f739c8 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 @@ -101,4 +101,12 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("供应商名称") private String vendorName; + + @Column(name = "ACTION_STATUS") + @ApiParam(value = "处理状态", example = "10") + public Integer actionStatus; + + @Column(name = "REMARK") + @ApiParam("备注") + public String remark; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac6e53d..57b0c74 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -42,7 +42,7 @@ public class WmsDocFgDetail extends BaseBean { public String lineNo; @Column(name="COMMIT_TIME") - @ApiParam("提交日期") + @ApiParam("提交时间") public String commitTime; @Column(name="MFG_LOG_NO") @@ -127,4 +127,8 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="REMARK") @ApiParam("备注") public String remark; + + @Column(name="COMMIT_DATE") + @ApiParam("提交日期") + public String commitDate; } 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 0e91584..a7fe71c 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 @@ -2067,4 +2067,25 @@ public class WmsHqlPack { return result; } + + /** + * 根据id集合查询生产报工明细表的数据 + * + * @param statusList + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList,String organizeCode) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(statusList,"asnStatus",result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); + DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + return result; + } } From b5ff789263c1754f07faed2b589f0073e2ca9bc8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 28 Jun 2019 17:17:49 +0800 Subject: [PATCH 35/99] =?UTF-8?q?=E5=BC=80=E5=8F=91=20wms=E6=8E=A8?= =?UTF-8?q?=E9=80=81AMP=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpPart.java | 45 +++++++++++++++ .../i3plus/pojo/wms/bean/AmpStockCurrent.java | 67 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 32 +++++++---- .../wms/repository/AmpStockCurrentRepository.java | 16 ++++++ 4 files changed, 148 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java new file mode 100644 index 0000000..d6950be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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 : AMP_物料 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-28 11:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="AMP_PART") +@Api("AMP_物料") +public class AmpPart extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + /** + * 状态：B汇总库存到AMP系统 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private String orderStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java new file mode 100644 index 0000000..8a365e0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : AMP_实时库存表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-28 11:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="AMP_STOCK_CURRENT") +@Api("AMP_实时库存表") +public class AmpStockCurrent extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "ZONE_NAME") + @ApiParam(value = "存储区名称") + private String zoneName; + + /** + * 状态：10=创建，20=已处理，30=处理出错 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private Integer orderStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 15580ec..5427a91 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -30,17 +30,6 @@ import javax.persistence.Transient; @Api("盘点实盘信息") public class WmsCSFactTrans extends BaseBean { - public WmsCSFactTrans(){} - - public WmsCSFactTrans(Double factQty, String partNo){ - if(factQty == null) { - this.factQty = 0d; - }else{ - this.factQty = factQty; - } - this.partNo = partNo; - } - @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; @@ -98,7 +87,26 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; - @Transient + @Column @ApiParam("源库位编号") public String srcLocateNo; + + @Column + @ApiParam("源存储区编号") + public String srcZoneNo; + + @Column + @ApiParam("源仓库编号") + public String srcWhNo; + + public WmsCSFactTrans(){} + + public WmsCSFactTrans(Double factQty, String partNo){ + if(factQty == null) { + this.factQty = 0d; + }else{ + this.factQty = factQty; + } + this.partNo = partNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java new file mode 100644 index 0000000..8f5f316 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.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.AmpStockCurrent; +import org.springframework.stereotype.Repository; + +/** + * @Description : AMP_实时库存表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-28 15:19 + * @Modify: + **/ +@Repository +public interface AmpStockCurrentRepository extends BaseRepository { +} From 493fbb83d905b85e1c697a82e1c3d03dd2b9f3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 18:01:28 +0800 Subject: [PATCH 36/99] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= 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 | 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 a052d53..6d2694a 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 @@ -1115,7 +1115,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getRefSrc(), "refSrc", result); // 物料编码支持多选 DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); From eefaf55f246a77f972a10bad3531d37d98884500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 19:05:17 +0800 Subject: [PATCH 37/99] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=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/AmpJisRec.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 55ddac9..3332735 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -62,8 +62,8 @@ public class AmpJisRec extends BaseBean{ public Integer orderStatus; @Column(name="VENDOR_NO") - @ApiParam(value = "g供应商编码", example = "10") - public Integer vendorNo; + @ApiParam(value = "供应商编码", example = "10") + public String vendorNo; @Column(name="REMARK") @ApiParam("备注") From 97adebba214e0e5ed33ae6875682447f84ce3ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 20:11:27 +0800 Subject: [PATCH 38/99] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=20=20=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= 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 | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 a47dcda..09b7200 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 @@ -2691,7 +2691,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), - TBMES("TBMES", "MES接口"); + TBMES("TBMES", "MES接口"), + AMP("AMP","AMP系统"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 3332735..7d342f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -109,4 +109,12 @@ public class AmpJisRec extends BaseBean{ @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) public Integer erpSyncFlag; + public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){ + this.id= id; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.vendorNo = vendorNo; + this.qty = qty; + this.unit = unit; + } } From c2609be241cb221ba1be342f8cec828d9fd7f1f5 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 28 Jun 2019 21:07:18 +0800 Subject: [PATCH 39/99] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=20=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 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 a052d53..e6cb9e5 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 @@ -329,7 +329,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); @@ -1434,7 +1434,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrintRcd.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); From da5d5d1af0f08091ac43f64e593f2de87db8ec7d Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Sat, 29 Jun 2019 13:06:18 +0800 Subject: [PATCH 40/99] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BC=96=E5=8F=B7-?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= 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 | 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 de94822..363bc77 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 @@ -475,7 +475,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //客户编号 - DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); //客户简称 DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 From cef6d9c3ad62d0717a92d5b643e53443909b93fc Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Sat, 29 Jun 2019 13:57:12 +0800 Subject: [PATCH 41/99] =?UTF-8?q?bug=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/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 363bc77..dd21435 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 @@ -633,7 +633,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); From bf02cbf8a48d6d3b282f0384bc5e7c9b384ec0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 29 Jun 2019 16:23:00 +0800 Subject: [PATCH 42/99] =?UTF-8?q?PDA=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E4=B8=9A=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8BbusiTypeDesc+=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 147 ++++++++++++++------- .../i3plus/pojo/model/wms/WmsTaskInfoModel.java | 8 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 120 ++++++++++------- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 16 ++- 4 files changed, 188 insertions(+), 103 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 1037ff2..9866c96 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 @@ -2709,55 +2709,110 @@ public class WmsEnumUtil { } } - public static Map getEnumByName(String enumName) throws Exception{ - Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 - Class clazz; - Enum[] enumConstants; - - Map enumMap;// 枚举类 - List> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】 - Map value;// 枚举实例属性 - - Method getValue; - Method getCode; - Method getDescription; - - // 遍历内部类 - String simpleName;//内部类的类名 - for (Class class1 : innerClazz) { - //获取内部内的类名 - simpleName = class1.getSimpleName(); - if (simpleName.equals(enumName)) { - // 判断类是不是枚举类 - clazz = (Class) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName); - - // 枚举类方法初始化 - getCode = null; - try { - getCode = clazz.getMethod("getCode"); - } catch (NoSuchMethodException e) { + public static Map getEnumByName(String enumName) throws Exception { + Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class clazz; + Enum[] enumConstants; + + Map enumMap;// 枚举类 + List> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】 + Map value;// 枚举实例属性 + + Method getValue; + Method getCode; + Method getDescription; + + // 遍历内部类 + String simpleName;//内部类的类名 + for (Class class1 : innerClazz) { + //获取内部内的类名 + simpleName = class1.getSimpleName(); + if (simpleName.equals(enumName)) { + // 判断类是不是枚举类 + clazz = (Class) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName); + + // 枚举类方法初始化 + getCode = null; + try { + getCode = clazz.getMethod("getCode"); + } catch (NoSuchMethodException e) { + } + getValue = clazz.getMethod("getValue"); + getDescription = clazz.getMethod("getDescription"); + + // 获取所有枚举实例 + enumConstants = clazz.getEnumConstants(); + enumMap = new HashMap<>(); + values = new ArrayList<>(); + for (Enum enum1 : enumConstants) { + value = new HashMap<>(); + value.put("value", getValue.invoke(enum1)); + if (getCode != null) { + value.put("code", getCode.invoke(enum1)); } - getValue = clazz.getMethod("getValue"); - getDescription = clazz.getMethod("getDescription"); - - // 获取所有枚举实例 - enumConstants = clazz.getEnumConstants(); - enumMap = new HashMap<>(); - values = new ArrayList<>(); - for (Enum enum1 : enumConstants) { - value = new HashMap<>(); - value.put("value", getValue.invoke(enum1)); - if (getCode != null) { - value.put("code", getCode.invoke(enum1)); - } - value.put("description", getDescription.invoke(enum1)); - values.add(value); - } - enumMap.put("enumName", clazz.getSimpleName()); - enumMap.put("valuesList", values); - return enumMap; + value.put("description", getDescription.invoke(enum1)); + values.add(value); + } + enumMap.put("enumName", clazz.getSimpleName()); + enumMap.put("valuesList", values); + return enumMap; + } + } + return null; + } + + /** + * 库存数量类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_QUAN_QTY_TYPE { + QTY("qty", "可用数量"), + FAIL_QTY("failQty", "不合格数量"), + HOLD_QTY("holdQty", "隔离数量"), + QC_QTY("qcQty", "质检中数量"), + RIN_QTY("rinQty", "待入库数量"), + FREEZE_QTY("freezeQty", "冻结数量"), + CONSIGN_QTY("consignQty", "寄售数量"), + LOCK_QTY("lockQty", "锁定数量"), + SCRAP_QTY("scrapQty", "报废数量"); + + private String code; + private String description; + + STOCK_QUAN_QTY_TYPE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public String getValue() { + return code; + } + + public static STOCK_QUAN_QTY_TYPE codeOf(String code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + return values()[i]; } } return null; + } + + public static String getDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code == code) { + tmp = values()[i].description; + } + } + return tmp; + } } } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index b20df0e..268bedd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -33,8 +33,8 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("关联单号") public String refSrc; - @ApiParam(value = "关联单据类型") - private String refType; + @ApiParam(value = "关联单据业务类型") + private String busiTypeDesc; @Column(name = "ZDATE") @ApiParam(value = "计划日期") @@ -56,13 +56,13 @@ public class WmsTaskInfoModel implements Serializable { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String refType, String zdate, String ztime, String custNo, String vendorNo) { + String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; this.transTypeCode = transTypeCode; this.refSrc = refSrc; - this.refType = refType; + this.busiTypeDesc = busiTypeDesc; this.zdate = zdate; this.ztime = ztime; this.custNo = custNo; 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 110155d..812efaa 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 @@ -28,103 +28,115 @@ import javax.persistence.Transient; @Table(name = "WMS_PART") @Api("物料表") public class WmsPart extends BaseBean { - @Column(name="PART_NO") - @ApiParam(value ="物料编码") + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") private String partNo; - @Column(name="PART_NAME") - @ApiParam(value ="物料名称") + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") private String partName; - @Column(name="PART_SPEC") - @ApiParam(value ="物料规格") + @Column(name = "PART_SPEC") + @ApiParam(value = "物料规格") private String partSpec; - @Column(name="PART_TYPE") - @ApiParam(value ="物料类型") + @Column(name = "PART_TYPE") + @ApiParam(value = "物料类型") private String partType; - @Column(name="PART_TYPE_DESC") - @ApiParam(value ="物料类型描述") + @Column(name = "PART_TYPE_DESC") + @ApiParam(value = "物料类型描述") private String partTypeDesc; - @Column(name="GRAPHI_NO") - @ApiParam(value ="图号") + @Column(name = "GRAPHI_NO") + @ApiParam(value = "图号") private String graphiNo; - @Column(name="VERSION") - @ApiParam(value ="版本") + @Column(name = "VERSION") + @ApiParam(value = "版本") private String version; - @Column(name="COLOR") - @ApiParam(value ="颜色") + @Column(name = "COLOR") + @ApiParam(value = "颜色") private String color; - @Column(name="STOCK_UNIT") - @ApiParam(value ="库存单位") + @Column(name = "STOCK_UNIT") + @ApiParam(value = "库存单位") private String stockUnit; - @Column(name="ABC") - @ApiParam(value ="分类") + @Column(name = "ABC") + @ApiParam(value = "分类") private String abc; - @Column(name="BUY_UNIT") - @ApiParam(value ="采购单位") + @Column(name = "BUY_UNIT") + @ApiParam(value = "采购单位") private String buyUnit; - @Column(name="BU2SU") - @ApiParam(value ="换算率1",example = "1") + @Column(name = "BU2SU") + @ApiParam(value = "换算率1", example = "1") private Double bu2su; - @Column(name="PRICE_UNIT") - @ApiParam(value ="计价单位") + @Column(name = "PRICE_UNIT") + @ApiParam(value = "计价单位") private String priceUnit; - @Column(name="PU2SU") - @ApiParam(value ="换算率2",example = "1") + @Column(name = "PU2SU") + @ApiParam(value = "换算率2", example = "1") private Double pu2su; - @Column(name="SNP") - @ApiParam(value ="标准包装",example = "1") + @Column(name = "SNP") + @ApiParam(value = "标准包装", example = "1") private Double snp; - @Column(name="IQC") - @ApiParam(value ="收货检验否",example = "1") + @Column(name = "IQC") + @ApiParam(value = "收货检验否", example = "1") private Integer iqc; - @Column(name="MIN") - @ApiParam(value ="最低库存",example = "1") + @Column(name = "MIN") + @ApiParam(value = "最低库存", example = "1") private Double min; - @Column(name="MAX") - @ApiParam(value ="最高库存",example = "1") + @Column(name = "MAX") + @ApiParam(value = "最高库存", example = "1") private Double max; - @Column(name="PART_GROUP") - @ApiParam(value ="物料组") + @Column(name = "PART_GROUP") + @ApiParam(value = "物料组") private String partGroup; - @Column(name="LOT_CHECK_RULE") - @ApiParam(value ="批次校验规则") + @Column(name = "LOT_CHECK_RULE") + @ApiParam(value = "批次校验规则") private String lotCheckRule; - @Column(name="SN_CONTROL") - @ApiParam(value ="是否条码管理",example = "1") + @Column(name = "SN_CONTROL") + @ApiParam(value = "是否条码管理", example = "1") private Integer snControl; - @Column(name="IN_LOCATE_NO") - @ApiParam(value ="默认入库库位") + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商代码") + private String vendorNo; + + @Column(name = "IN_LOCATE_NO") + @ApiParam(value = "默认入库库位") private String inLocateNo; - @Column(name="PROD_CFG_TYPE_CODE") + @Transient + @ApiParam("默认入库存储区") + private String inZoneNo; + + @Transient + @ApiParam("默认入库仓库") + private String inWhNo; + + @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; - @Column(name="PROD_CFG_TYPE_NAME") + @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") private String prodCfgTypeName; - @Column(name="OUT_CLOSE_FLAG") + @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") private String outCloseFlag; @@ -136,13 +148,23 @@ public class WmsPart extends BaseBean { @ApiParam("库存水平") private String stockLevelStatus; - public WmsPart(){} - public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){ + public WmsPart() { + } + + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) { this.partNo = partNo; this.partName = partName; this.max = maxQty; this.min = minQty; this.qty = cqty; } + + public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) { + this.partNo = partNo; + this.vendorNo = vendorNo; + this.inLocateNo = inLocateNo; + this.inZoneNo = inZoneNo; + this.inWhNo = inWhNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 68e40c5..4afeabe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -91,9 +91,9 @@ public class WmsTaskDetails extends BaseBean { @ApiParam(value = "状态", example = "1") private Integer itemStatus; - public Integer getItemStatus(){ - if(itemStatus == null) { - return null; + public Integer getItemStatus() { + if (itemStatus == null) { + return null; } return itemStatus.intValue(); } @@ -134,11 +134,19 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public Integer busiType; + + @Column(name = "BUSI_TYPE_DESC") + @ApiParam("业务类型描述") + public String busiTypeDesc; + public Double getQty() { return this.qty == null ? 0 : this.qty; } - public String getQtyTxt(){ + public String getQtyTxt() { return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString(); } From 98de08ba4a47f96519d201f8a5061ed061e4667c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Jun 2019 17:01:49 +0800 Subject: [PATCH 43/99] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AD=97=E6=AE=B5=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 ++ .../cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java | 8 +++++++- .../cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 8 +++++++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java | 8 +++++++- .../cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 8 +++++++- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 ++- 8 files changed, 43 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 9730fb8..b790007 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1713,10 +1713,10 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRIGGER_EVENT { - CLICK(10, "CLICK", "单击"), - DB_LCLICK(20, "DB_LCLICK", "双击"), - MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), - MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入"); + CLICK(10, "CLICK", "单击"); +// DB_LCLICK(20, "DB_LCLICK", "双击"), +// MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), +// MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入"); private int value; private String code; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 5361cd0..5eaa6c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -83,6 +83,13 @@ public class SysDictionary extends BaseBean { @ApiParam(value = "是否默认",example = "2") private Integer isDefault; + public int getIsDefaultVal(){ + if(this.isDefault == null){ + return 0; + } + return isDefault.intValue(); + } + @Column(name="DICTIONARY_DESCRIPTION") @ApiParam(value ="描述") private String dictionaryDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 85b26eb..d46b5da 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; @@ -35,6 +36,7 @@ public class SysUser extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; + @ColumnDefault("CN/zh") @Column(name="LANGUAGE_CODE") @ApiParam(value ="用户语言") private String languageCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index c4d47ff..f277ace 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION") +@Table(name="SYS_LOG_EXCEPTION", + indexes = { + @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") + } +) @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 543dac6..5e20049 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -29,7 +30,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE") +@Table(name="SYS_LOG_OPERATE", + indexes = { + @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"), + @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE") +}) @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index c9e32ec..f4fdc54 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -29,7 +30,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM") +@Table(name="SYS_LOG_SYSTEM", + indexes = { + @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"), + @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID") + }) @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 569a11c..c5928ee 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME") +@Table(name="SYS_LOG_TASK_TIME", + indexes = { + @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"), + @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME") + }) @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { 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 5b60a92..9b24ccb 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 @@ -240,6 +240,7 @@ public class CoreHqlPack { HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); // 添加默认排序 HqlPack.getOrderDefault(dictionary); @@ -256,7 +257,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(toolType.getName(),"name",result); + HqlPack.getStringLikerPack(toolType.getName(),"name", result); // 添加默认排序 HqlPack.getOrderDefault(toolType); From 4fe37019293d78cc52c6271abd55bbeea752d29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Jun 2019 17:03:04 +0800 Subject: [PATCH 44/99] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index d46b5da..aa214c0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -7,12 +7,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -36,7 +37,6 @@ public class SysUser extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; - @ColumnDefault("CN/zh") @Column(name="LANGUAGE_CODE") @ApiParam(value ="用户语言") private String languageCode; From 529617a8b78a67b0671137c663d756d65904131d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 29 Jun 2019 18:32:26 +0800 Subject: [PATCH 45/99] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java index d6950be..680a7bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java @@ -39,7 +39,7 @@ public class AmpPart extends BaseBean { /** * 状态：B汇总库存到AMP系统 */ - @Column(name = "ORDER_STATUS") + @Column(name = "status") @ApiParam(value = "状态") - private String orderStatus; + private String status; } From 15386ae5c21a4cf4815773e1bc6b5f96fcd53349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 29 Jun 2019 19:14:25 +0800 Subject: [PATCH 46/99] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 922eae5..e903261 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 @@ -2442,6 +2442,7 @@ public class WmsEnumUtil { public enum IMPORT_ORDER_TYPE { PO("PO", "要货计划"), ASN("ASN", "ASN"), + INSTRUCTIONS("INSTRUCTIONS", "指令"), SCATTERED_OUT("C00", "零星出库指令"), SCATTERED_INT("C01", "零星入指令"), NC_DISMANTLING_PICKING("C02", "NC拆解领料"), @@ -2778,11 +2779,11 @@ public class WmsEnumUtil { LOCK_QTY("lockQty", "锁定数量"), SCRAP_QTY("scrapQty", "报废数量"); - private String code; + private String value; private String description; - STOCK_QUAN_QTY_TYPE(String code, String description) { - this.code = code; + STOCK_QUAN_QTY_TYPE(String value, String description) { + this.value = value; this.description = description; } @@ -2791,16 +2792,16 @@ public class WmsEnumUtil { } public String getCode() { - return code; + return value; } public String getValue() { - return code; + return value; } public static STOCK_QUAN_QTY_TYPE codeOf(String code) { for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(code)) { return values()[i]; } } @@ -2810,7 +2811,7 @@ public class WmsEnumUtil { public static String getDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].code == code) { + if (values()[i].value == code) { tmp = values()[i].description; } } From 81eb13bafd151f33e643ca9f88934891a0fad16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 29 Jun 2019 19:17:18 +0800 Subject: [PATCH 47/99] =?UTF-8?q?=E5=86=99=E5=85=A5SAP=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsSapOrderLock.java | 47 ++++++++++++++++++++++ .../wms/repository/WmsSapOrderLockRepository.java | 14 +++++++ 2 files changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java new file mode 100644 index 0000000..8d39279 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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 SAP_单据锁定表 + * @Reference + * @Author dragon + * @CreateDate 2019/6/29 18:04 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SAP_ORDER_LOCK") +@Api("SAP_单据锁定") +public class WmsSapOrderLock extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "ITEM") + @ApiParam("行号") + public String item; + + @Column(name = "LOCK_FLAG") + @ApiParam("锁定标识") + public String lockFlag; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java new file mode 100644 index 0000000..f1671a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock; + +/** + * @Description SAP_单据锁定 DAO层接口 + * @Reference + * @Author dragon + * @CreateDate 2019/6/29 18:35 + * @Modify + */ +public interface WmsSapOrderLockRepository extends BaseRepository { +} From ac5bf14d6b78b7074fc0f6b91d316c7bb28fa96b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 29 Jun 2019 20:41:25 +0800 Subject: [PATCH 48/99] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=93=8D=E4=BD=9C=E3=80=80=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java | 4 ---- 3 files changed, 4 insertions(+), 7 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 c75399c..15c744f 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 @@ -115,7 +115,8 @@ public class DynamicEntity extends BaseBean implements Serializable { Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); setMethod.invoke(this, val); } catch (NoSuchMethodException e) { - LOGGER.error("没有方法：{}",setMethodName,e); +// LOGGER.error("没有方法：{}",setMethodName,e); + LOGGER.error("没有方法：{}",setMethodName); } catch (IllegalAccessException e) { LOGGER.error("入参出错：{}:{}",val,val.getClass(),e); } catch (InvocationTargetException e) { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index f4a6151..511e343 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -56,7 +56,7 @@ public class BfElementProperty extends BaseBean { private String propertyTypeNameRdd; @Column(name="PROPERTY_NAME") - @ApiParam(value ="元素名称") + @ApiParam(value ="元素属性名称") private String propertyName; @Column(name="PROPERTY_CODE_RDD") @@ -137,6 +137,6 @@ public class BfElementProperty extends BaseBean { private BfDataObjectProperty objectProperty; public Object getFormValue() { - return propertyFormValue == null ? propertyDefaultValue: propertyFormValue; + return propertyFormValue; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index af3fb1d..6e8adc4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -40,10 +40,6 @@ public class SysRole extends BaseBean { @ApiParam(value ="资源描述") private String roleDescription; - @Column(name="ROLE_GRADE") - @ApiParam(value ="角色等级（待定）" , example ="-1") - private Integer roleGrade; - @Column(name="MODULE_NUMBER") @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量") private Integer moduleNumber; From 9b9f94f059cdd721a3081a670877c48f869f6ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 29 Jun 2019 21:19:53 +0800 Subject: [PATCH 49/99] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java index f1671a0..d145a1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock; +import org.springframework.stereotype.Repository; /** * @Description SAP_单据锁定 DAO层接口 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock; * @CreateDate 2019/6/29 18:35 * @Modify */ +@Repository public interface WmsSapOrderLockRepository extends BaseRepository { } From 92daec97e3ad4cd30405163d4a745c32af45de64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 30 Jun 2019 14:31:26 +0800 Subject: [PATCH 50/99] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e903261..9bba3de 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 @@ -95,7 +95,7 @@ public class WmsEnumUtil { SUB(20, "SUB", "委外采购"), TAR(30, "TAR", "多角贸易采购"), TAP(40, "TAP", "多角代采购"), - AMP(50, "AMP", "AMP拉动"); + AMP(50, "AMP", "AMP收货"); private int value; private String code; From 52b9e09835fa9c8df9ee842c69b1965d99296fbb Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Mon, 1 Jul 2019 11:35:45 +0800 Subject: [PATCH 51/99] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0-?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= 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 | 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 dd21435..efee74e 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 @@ -1412,7 +1412,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); From 27ba751a0977ff0b173b17a8890293793d6280e5 Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 1 Jul 2019 13:39:42 +0800 Subject: [PATCH 52/99] =?UTF-8?q?=E4=BF=AE=E6=94=B9iqc=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 +++ 1 file changed, 3 insertions(+) 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 812efaa..f18b307 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 @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import net.bytebuddy.implementation.bind.annotation.Default; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -88,6 +90,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "标准包装", example = "1") private Double snp; + @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "收货检验否", example = "1") private Integer iqc; From 19b57647769bc8247d2d6e7ffd6c1ea3110f7b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 1 Jul 2019 16:29:41 +0800 Subject: [PATCH 53/99] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9B=9E=E6=89=A7?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=20=20?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=20=E5=87=BA=E5=BA=93=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index 78d6fdc..9046594 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -64,6 +64,18 @@ public class BasVendor extends BaseBean{ @ApiParam(value = "密码") private String password; + @Column(name = "VENDOR_CALL") + @ApiParam("供应商电话") + private String vendorCall; + + @Column(name = "VENDOR_FAX") + @ApiParam("传真") + private String vendorFax; + + @Column(name = "VENDOR_PHONE") + @ApiParam("手机") + private String vendorPhone; + public BasVendor() { } 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 0f739c8..b3feab4 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 @@ -109,4 +109,16 @@ public class WmsASNMaster extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") public String remark; + + @Transient + @ApiParam("供应商电话") + private String vendorCall; + + @Transient + @ApiParam("传真") + private String vendorFax; + + @Transient + @ApiParam("手机") + private String vendorPhone; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index c400de9..3ba7285 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -119,4 +119,16 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("邮箱") private String vendorEmail; + + @Transient + @ApiParam("供应商电话") + private String vendorCall; + + @Transient + @ApiParam("传真") + private String vendorFax; + + @Transient + @ApiParam("手机") + private String vendorPhone; } From fede09a5ebdd8492546bb3bbe9a18264661e07a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 1 Jul 2019 17:01:22 +0800 Subject: [PATCH 54/99] =?UTF-8?q?WMS=5FERP=E5=BA=93=E5=AD=98=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E8=A1=A8=E4=BF=AE=E6=94=B9item=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 5b44eb5..d65afe3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -64,8 +64,8 @@ public class WmsMoveToERP extends BaseBean { private String carNo; @Column(name="ITEM") - @ApiParam(value = "行号", example = "0") - public Integer item; + @ApiParam(value = "行号") + public String item; @Column(name="PART_NO") @ApiParam("物料编码") From 1ee48f4ef8854394ec327bb07e9a28ab7d0cc670 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Mon, 1 Jul 2019 17:29:14 +0800 Subject: [PATCH 55/99] xxx --- .../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 efee74e..f1c64dd 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 @@ -247,7 +247,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); From 1ac5542541885cf4a1f23c9007d19fa5ef701fdc Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 1 Jul 2019 20:46:00 +0800 Subject: [PATCH 56/99] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/common/Pager.java | 20 ++++++++++++++++++++ .../i3plus/pojo/form/bean/BfDataObjectProperty.java | 4 ++++ .../estsh/i3plus/pojo/model/form/ElementModel.java | 4 ++++ 3 files changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 6035ea3..b961226 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -101,6 +101,12 @@ public class Pager { } public int getTotalPages() { + if(pageSize > 0 && totalRows > 0){ + totalPages = totalRows / pageSize; + if (totalRows % pageSize > 0) { + totalPages++; + } + } return totalPages; } @@ -109,6 +115,13 @@ public class Pager { } public int getStartRow() { + if(pageSize > 0){ + if(currentPage >= 1){ + return currentPage * pageSize - pageSize; + }else { + return 0; + } + } return startRow; } @@ -125,6 +138,13 @@ public class Pager { } public int getEndRow() { + if(pageSize > 0){ + if(currentPage > 1){ + return currentPage * pageSize; + }else { + return pageSize; + } + } return endRow; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 45b9c64..8e246ce 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -62,6 +62,10 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="是否主键") private Integer isPrimaryKey; + @Column(name="IS_NULLABLE") + @ApiParam(value = "是否允许为空") + private Integer isNullable; + // 字段长度 @ApiParam(value = "字段长度") @Column(name="OBJECT_COLUMN_PRECISION") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 822b260..9954438 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.form.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -56,6 +57,9 @@ public class ElementModel{ @ApiParam(value = "元素类型") private Integer elementType; + @ApiParam(value = "分页信息") + private Pager pager; + @ApiParam(value = "排序属性") public String orderByParam; From 681ca7eebe13f084d4530b0c8bbd8c31f51f1223 Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 1 Jul 2019 20:56:49 +0800 Subject: [PATCH 57/99] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 +++ 1 file changed, 3 insertions(+) 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 f18b307..61c8310 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,9 @@ public class WmsPart extends BaseBean { @ApiParam("库存水平") private String stockLevelStatus; + public int getIqcValue(){ + return this.iqc == null ? 0 : this.iqc.intValue(); + } public WmsPart() { } From 97b60f090661b7476f1862e8ef048ca39e3a49fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 1 Jul 2019 21:06:33 +0800 Subject: [PATCH 58/99] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97HQL?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 5812917..f074954 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 @@ -61,4 +61,11 @@ public class WmsTransType extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long tmId; + @Column(name = "PDA_ICON") + @ApiParam(value = "PDA图标") + private String pdaIcon; + + @Transient + @ApiParam("菜单URL") + private String menuUrl; } From 2c28d6303f99c74a441652166f832588da5ad8c2 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 2 Jul 2019 11:08:14 +0800 Subject: [PATCH 59/99] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 14 ++++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index a4b9feb..24e000d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -68,4 +68,18 @@ public class WmsLocatePart extends BaseBean { public Integer getIsGeneratePicklist() { return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist; } + + public double getPullQtyValue(){ + return this.pullQty ==null?0d:this.pullQty.doubleValue(); + } + + public double getMaxValue(){ + return this.max ==null?0:this.max.doubleValue(); + } + + public double getMinValue(){ + return this.min ==null?0:this.min.doubleValue(); + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 10a2c6a..59ed0dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -40,4 +40,8 @@ public class WmsUnit extends BaseBean { @ApiParam(value = "单位精度") private Integer unitPrecision; + public int getUnitPrecisionValue(){ + return this.unitPrecision == null?0:this.unitPrecision.intValue(); + } + } From e95db40c236110934e7b843560b32e1787a50dec Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Tue, 2 Jul 2019 17:35:32 +0800 Subject: [PATCH 60/99] 123 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9bba3de..cece287 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 @@ -2505,7 +2505,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"); private int value; private String description; From 81ed2465e3c9ca9a13c52d51d54f48691b38c77b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 2 Jul 2019 17:35:45 +0800 Subject: [PATCH 61/99] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=8C=83=E5=9B=B4=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 5427a91..efc024e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -99,8 +99,16 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("源仓库编号") public String srcWhNo; + @Column + @ApiParam("是否范围内") + public Integer isScope; + public WmsCSFactTrans(){} + public Integer getIsScopeVal() { + return isScope== null ? 0 : this.isScope.intValue(); + } + public WmsCSFactTrans(Double factQty, String partNo){ if(factQty == null) { this.factQty = 0d; @@ -109,4 +117,20 @@ public class WmsCSFactTrans extends BaseBean { } this.partNo = partNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + } } From 994da92b4e197feae41724b5eded4b154845e2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 2 Jul 2019 18:51:17 +0800 Subject: [PATCH 62/99] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E5=86=BB=E7=BB=93=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=9BstockQuan=E6=B7=BB=E5=8A=A0getVal?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 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 9bba3de..5355046 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 @@ -1082,7 +1082,8 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"); + HANDLE_ERROR(40, "处理出错"), + TEST(50, "调试"); private int value; private String description; @@ -2693,7 +2694,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP","AMP系统"); + AMP("AMP", "AMP系统"); private String value; private String description; 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 73a9619..0c5cb4c 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 @@ -122,39 +122,39 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - public Double getQty() { + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } - public Double getFailQty() { + public Double getFailQtyVal() { return this.failQty == null ? 0 : this.failQty; } - public Double getHoldQty() { + public Double getHoldQtyVal() { return this.holdQty == null ? 0 : this.holdQty; } - public Double getQcQty() { + public Double getQcQtyVal() { return this.qcQty == null ? 0 : this.qcQty; } - public Double getRinQty() { + public Double getRinQtyVal() { return this.rinQty == null ? 0 : this.rinQty; } - public Double getFreezeQty() { + public Double getFreezeQtyVal() { return this.freezeQty == null ? 0 : this.freezeQty; } - public Double getConsignQty() { + public Double getConsignQtyVal() { return this.consignQty == null ? 0 : this.consignQty; } - public Double getLockQty() { + public Double getLockQtyVal() { return this.lockQty == null ? 0 : this.lockQty; } - public Double getScrapQty() { + public Double getScrapQtyVal() { return this.scrapQty == null ? 0 : this.scrapQty; } From 9dc634d63ee94d1a64e75f4d2bd67c55c392de23 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 2 Jul 2019 19:47:38 +0800 Subject: [PATCH 63/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ 1 file changed, 2 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 9b24ccb..e68b624 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 @@ -381,6 +381,7 @@ public class CoreHqlPack { // And X = X HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); @@ -491,6 +492,7 @@ public class CoreHqlPack { // And HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); From 172fc81bee75f7d786b71f039c373b82bb46b562 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 2 Jul 2019 20:06:19 +0800 Subject: [PATCH 64/99] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++++- 2 files changed, 15 insertions(+), 2 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 73a9619..60c4e87 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 @@ -122,6 +122,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; + @Transient + @ApiParam(value = "总数量") + private Double totalQty; + public Double getQty() { return this.qty == null ? 0 : this.qty; } @@ -158,11 +162,16 @@ public class WmsStockQuan extends BaseBean { return this.scrapQty == null ? 0 : this.scrapQty; } + public Double getTotalQty() { + return this.totalQty == null ? 0 : this.totalQty; + } + public WmsStockQuan() { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; 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 f1c64dd..0d9a204 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 @@ -412,7 +412,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + if(wmsLocate.getZoneNo() != null){ + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result); + } + + // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); From 073393a5b152604a5acd1c12ddb88007f55d9f86 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 2 Jul 2019 20:18:06 +0800 Subject: [PATCH 65/99] =?UTF-8?q?bug=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/WmsStockQuan.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 0c5cb4c..4c690e0 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 @@ -122,6 +122,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; + @Transient + @ApiParam(value = "总数量") + private Double totalQty; + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } @@ -158,6 +162,10 @@ public class WmsStockQuan extends BaseBean { return this.scrapQty == null ? 0 : this.scrapQty; } + public Double getTotalVal() { + return this.totalQty == null ? 0 : this.totalQty; + } + public WmsStockQuan() { } From d3deaa60815c710eb81c262342cd803c4271d44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 2 Jul 2019 21:24:27 +0800 Subject: [PATCH 66/99] =?UTF-8?q?=E5=AE=89=E7=81=AFbug=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=201.=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85=E4=B8=AD=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E5=90=8C=E4=B8=80=E4=B8=AA=E5=B7=A5=E4=BD=8D=E5=90=8C?= =?UTF-8?q?=E7=A7=8D=E5=91=BC=E5=8F=AB=E5=90=8C=E4=B8=80=E4=B8=AA=E5=91=BC?= =?UTF-8?q?=E5=8F=AB=E5=8D=95=E4=BB=BB=E5=8A=A1=E6=9C=89=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=202.PLC=EF=BC=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=9C=B0=E5=9D=80=E3=80=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=B1?= =?UTF-8?q?=E6=95=88=203.=E9=80=9A=E7=9F=A5=E5=AF=B9=E8=B1=A1=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AF=B9=E8=B1=A1=E5=80=BC=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=204.=E9=80=9A=E7=9F=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=E3=80=82=205.=E4=BA=8B=E4=BB=B6=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=EF=BC=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 46 +++++++++++++++++++++- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 22 +++++++---- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 1575b05..902b0bc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -120,7 +120,7 @@ public class AndonHqlPack { } /** - * 按条件查询ANDON呼叫原因 + * 按条件查询ANDON呼叫原因,== * @param andonAlarmCause * @return */ @@ -134,6 +134,22 @@ public class AndonHqlPack { return result; } + /** + * 按条件模糊查询ANDON呼叫原因, + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result); + + getStringBuilderPack(andonAlarmCause, result); + + return result; + } /** * 按条件查询ANDON事件处理方法 @@ -439,6 +455,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result); + getStringBuilderPack(andonEventCause, result); return result; @@ -487,8 +508,29 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonPLC(AndonPLC plc) { DdlPackBean result = new DdlPackBean(); - getStringBuilderPack(plc, result); + DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); + DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); + + getStringBuilderPack(plc, result); return result; } + + /** + * 检查安灯记录是否以存在 + * @param andonManageRecord + * @return + */ + public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result); + + getStringBuilderPack(andonManageRecord, result); + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 6dc423e..9788e06 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -242,25 +242,31 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM","物料"), - QUALITY("QUALITY_ALARM","质量"), - EQUIP("EQUMENT_ALARM","设备"), - PROCESS("ROUTING_ALARM","工艺"), - CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "自动报警"); + PART("PART_ALARM", 111020005, "物料"), + QUALITY("QUALITY_ALARM", 111020006, "质量"), + EQUIP("EQUMENT_ALARM", 111020007, "设备"), + PROCESS("ROUTING_ALARM", 111020008, "工艺"), + CHECK("OTHER_ALARM", 111020009, "其他"), + FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); private String value; + private Integer code; private String description; - ALARM_TYPE(String value, String description) { + ALARM_TYPE(String value, Integer code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getValue() { + public String getValue() { return value; } + public Integer getCode() { + return code; + } + public String getDescription() { return description; } From 78cfff1748dd37740122c8fe6b2102cd806dbe59 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 2 Jul 2019 22:33:28 +0800 Subject: [PATCH 67/99] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index 96fa22a..fbbfbe2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -59,6 +59,10 @@ public class SysOrganize extends BaseBean { @ApiParam(value ="组织描述") private String organizeDescription; + @Column(name="ORGANIZE_ADDRESS") + @ApiParam(value ="组织地址") + private String organizeAddress; + @Column(name="ORGANIZE_SORT") @ApiParam(value ="排序" , example ="1") private Integer organizeSort; 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 68/99] =?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 69/99] 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 70/99] =?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 71/99] =?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 72/99] =?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 73/99] =?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 74/99] =?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 75/99] =?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 76/99] =?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 77/99] =?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 78/99] =?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 79/99] =?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 From af278555d0aa503016e6de9fa1a61c24124f30b2 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 4 Jul 2019 20:59:58 +0800 Subject: [PATCH 80/99] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=94=B9=E5=8A=A8=E4=BB=A5=E5=8F=8Abug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 69 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +- 2 files changed, 71 insertions(+), 2 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 4c690e0..5b70bb8 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 @@ -126,6 +126,26 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "总数量") private Double totalQty; + @Transient + @ApiParam(value = "项目名称") + private String prodCfgTypeName; + + @Transient + @ApiParam(value = "箱数", example = "-1") + private Integer boxQty; + + @Transient + @ApiParam(value = "零件数", example = "-1") + private Double partQty; + + @Transient + @ApiParam(value = "ERP库存地") + private String areaNo; + + public String getAreaNo() { + return areaNo; + } + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } @@ -166,6 +186,14 @@ public class WmsStockQuan extends BaseBean { return this.totalQty == null ? 0 : this.totalQty; } + public Double getPartQtyVal() { + return this.partQty == null ? 0 : this.partQty; + } + + public Integer getBoxQtyVal() { + return this.boxQty == null ? 0 : this.boxQty; + } + public WmsStockQuan() { } @@ -196,4 +224,45 @@ public class WmsStockQuan extends BaseBean { this.lockQty = lockQty; this.scrapQty = scrapQty; } + + public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.locateNo = locateNo; + this.boxQty = boxQty; + this.partQty = partQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.sumQty = sumQty; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } + + public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.boxQty = boxQty; + this.partQty = partQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } } 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..cb68549 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 @@ -2000,8 +2000,8 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result); - DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result); + DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitCode(), "unitCode", result); + DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitName(), "unitName", result); DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result); getStringBuilderPack(wmsUnit, result); From f0e0867e2c0b2da9339c3cf57df8cc4550a1bdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Jul 2019 10:01:57 +0800 Subject: [PATCH 81/99] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8pojo?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= 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 | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 e3454c5..a85fbac 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,7 +502,11 @@ 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", "线边报废出库"), + ASN(190, "ASN", "ASN"), + PO(200, "PO", "PO"), + QC(210, "QC", "QC"), + AMPR(210, "AMPR", "AMPR"); private int value; 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..2d9ff35 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 @@ -105,6 +105,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "状态", example = "0") public Integer itemStatus; + @Column(name="REF_ITEM") + @ApiParam("关联单据行号") + public String refItem; + /** * ASN,PO,SO */ From fba99de79556595f4e9790b111259604a9d6b309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Jul 2019 10:06:36 +0800 Subject: [PATCH 82/99] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=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/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 88f4ff5..b51bb14 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 @@ -506,7 +506,7 @@ public class WmsEnumUtil { ASN(190, "ASN", "ASN"), PO(200, "PO", "PO"), QC(210, "QC", "QC"), - AMPR(210, "AMPR", "AMPR"); + AMPR(220, "AMPR", "AMPR"); private int value; From 0ca528bade4ba699c777edd5e6664a18d6f3aeee Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 4 Jul 2019 20:56:43 +0800 Subject: [PATCH 83/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 48 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 4 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 641f8b3..3c28d85 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 @@ -98,14 +98,19 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysPosition(SysPosition position){ - DdlPackBean result = new DdlPackBean(); + return packHqlSysPosition(position,null); + } + public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + DdlPackBean result = new DdlPackBean(); // 查询参数封装 DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); - DdlPreparedPack.getStringEqualPack(position.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result); - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + // String Like + DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + // In + DdlPreparedPack.getInPackList(idList,"id",result); return result; } @@ -217,6 +222,7 @@ public class CoreHqlPack { * @param role * @return */ + @Deprecated public static String packHqlSysRole(SysRole role){ StringBuffer result = new StringBuffer(); @@ -231,6 +237,27 @@ public class CoreHqlPack { } /** + * 系统角色复杂查询 + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role){ + return packDdlBeanSysRole(role,null); + } + + public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); + DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + return result; + } + + /** * 系统参数复杂查询 * @param config * @return @@ -797,6 +824,19 @@ public class CoreHqlPack { return ddlPackBean; } + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + DdlPackBean result = new DdlPackBean(); + + // Number Eq + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + // String Eq + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + + return result; + } + /** * 查询当前用户所有组织数据 * @param sysRefUserDepartments From 1b1bc67c90840e7e42384ad717aeeac01158ec97 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 10:15:54 +0800 Subject: [PATCH 84/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=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/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 156a405..5a5a836 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -247,7 +247,9 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_TYPE { - USER(1, "user", "普通用户"), ADMIN(2, "admin", "系统管理员"), SA(3, "sa", "超级管理员"); + USER(1, "user", "普通用户"), + ADMIN(2, "admin", "系统管理员"), + SA(3, "sa", "超级管理员"); private int value; private String code; From b2866c85dd6c4f2ee2a9d7727574c21402bce9b5 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 5 Jul 2019 10:49:11 +0800 Subject: [PATCH 85/99] =?UTF-8?q?bug=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/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 281f442..15184c4 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 @@ -807,6 +807,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + getStringBuilderPack(wmsStockSn, result); return result; From a1a77b63db3e19f731afc2ceb67495bd6a2b6fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 5 Jul 2019 13:34:27 +0800 Subject: [PATCH 86/99] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E3=80=81=E6=98=AF=E5=90=A6=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1=E3=80=82=20POJO=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B5=8B=E5=80=BC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0c1b599..e25c770 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 @@ -141,7 +141,7 @@ public class WmsPart extends BaseBean { @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - private String outCloseFlag; + private String outCloseFlag = "2"; @Transient @ApiParam("总数量") @@ -153,7 +153,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_PROD_LOT") @ApiParam(value = "是否录入生产批次", example = "1") - private Integer isProdLot; + private Integer isProdLot = 2; public int getIqcValue(){ return this.iqc == null ? 0 : this.iqc.intValue(); From 78cd5dc77efb78b9caac8c0cffdfc2bd61961630 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 14:14:25 +0800 Subject: [PATCH 87/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 5a5a836..b6d4ef7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -283,6 +283,26 @@ public class CommonEnumUtil { return tmp; } + public static USER_TYPE valueOfCode(String code) { + USER_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static USER_TYPE valueOfDescription(String description) { + USER_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i]; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { From 0041ce328eb48911c40b299e458061851074d36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 5 Jul 2019 14:20:15 +0800 Subject: [PATCH 88/99] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 65 ++++++++++++++++++++- .../cn/estsh/i3plus/pojo/base/util/BaseRedis.java | 9 +++ .../pojo/platform/bean/SysLocaleResource.java | 4 +- .../i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 68 +++++++++++++--------- 4 files changed, 117 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index 607427d..98dcfd7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -109,7 +109,6 @@ public class BsonPackTool { return list; } - /** * 封装日期 * @param startDate 开始日期 @@ -161,7 +160,7 @@ public class BsonPackTool { * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 * @param isShowTime 是否包含时分秒 */ - public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) { + public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) { if(date != null && !"null".equals(date) && date.trim().length() > 0){ date = getSafeParam(date); @@ -249,6 +248,68 @@ public class BsonPackTool { } /** + * 大于日期 + * @param dateTime 日期 + * @param columnName HQL里对应的时间字段 + * @param bson 封装的bson + * @param isShowTime 是否包含时分秒 + */ + public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) { + if (dateTime == null || dateTime.trim().length() == 0) { + dateTime = "1900-01-01"; + } else { + dateTime = getSafeParam(dateTime); + dateTime = dateTime.trim(); + } + if (isShowTime && dateTime.trim().length()<=11) { + dateTime+= " 00:00:00"; + } + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, dateTime) //大于等于开始日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, dateTime) //大于等于开始日期 + ); + } + + return bson; + } + + /** + * 小于日期 + * @param dateTime 日期 + * @param columnName HQL里对应的时间字段 + * @param bson 封装的bson + * @param isShowTime 是否包含时分秒 + */ + public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) { + if (dateTime == null || dateTime.trim().length() == 0) { + dateTime = "2100-01-01"; + } else { + dateTime = getSafeParam(dateTime); + dateTime = dateTime.trim(); + } + if (isShowTime&& dateTime.trim().length()<=11) { + dateTime+= " 23:59:59"; + } + if(bson == null) { + bson = Filters.and( + Filters.lte(columnName, dateTime) //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.lte(columnName, dateTime) //小于等于结束日期 + ); + } + + return bson; + } + + /** * 封装String对象成like语句 * @param str 对象值 * @param columnName 列名 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java index f0fb196..21f56a3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java @@ -50,6 +50,15 @@ public interface BaseRedis { Object getObject(Object key); /** + * 普通缓存获取 + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return 值 + */ + Object getObject(Object key, long start, long end); + + /** * 普通缓存放入 * @param key 键 * @param value 值 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 81adc82..1a6f01a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -55,7 +56,8 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; - @Column(name="resource_value",columnDefinition="TEXT") + @Lob + @Column(name="resource_value") @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取") private String resourceValue; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index c4bedb4..9e7722d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; @@ -19,82 +20,97 @@ public class CoreBsonPack { /** * 日志复杂查询 + * * @param logSystem * @return */ - public static Bson packBsonByLogSystem(SysLogSystem logSystem){ + public static Bson packBsonByLogSystem(SysLogSystem logSystem) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(),"logModuleId",bson); - bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(),"createDatetime",bson,false,false); - bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(),"remoteIp",bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(),"requestUrl",bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(),"logMethod",bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson); + bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson); return bson; } /** * 系统操作日志 + * * @param logOperate * @return */ - public static Bson packBsonByLogOperate(SysLogOperate logOperate){ + public static Bson packBsonByLogOperate(SysLogOperate logOperate) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson); - bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false); - bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(),"remoteIp",bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(),"operateMessage",bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson); + bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson); return bson; } /** * 系统异常日志复杂查询 + * * @param sysLogException * @return */ - public static Bson packBsonBySysLogException(SysLogException sysLogException){ + public static Bson packBsonBySysLogException(SysLogException sysLogException) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson); - bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson); + bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); + bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false); return bson; } /** * 定时任务日志复杂查询 + * * @param sysLogTaskTime * @return */ - public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){ + public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(),"name",bson); - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(),"groupName",bson); - bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson); + bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false); return bson; } /** * 区间 + * * @param colName * @param min * @param max * @return */ - public static Bson packBsonByInterval(String colName,Object min,Object max){ + public static Bson packBsonByInterval(String colName, Object min, Object max) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumBiggerPack(min,colName,bson); - bson = BsonPackTool.getNumSmallerPack(max,colName,bson); + bson = BsonPackTool.getNumBiggerPack(min, colName, bson); + bson = BsonPackTool.getNumSmallerPack(max, colName, bson); return bson; - }} + } + + /** + * 指定日期之后 + * @param dateTime 日期 + * @return + */ + public static Bson packBsonByDateTimeAfter(String dateTime){ + return BsonPackTool.timeLess(dateTime, "createDatetime", null, true); + } +} From 8a5a7c23ca0f9c4a81e1882e72a25ae1bed2236e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 5 Jul 2019 14:22:13 +0800 Subject: [PATCH 89/99] =?UTF-8?q?andonPLC=20MQ=20=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 20 ++++++++++++++++ .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 7 ++++++ .../sqlpack/AndonHqlPack.java | 27 ++++++++++++++++++---- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index cfd9634..de3e10a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -7,10 +7,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.beanutils.BeanUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.List; /** @@ -394,4 +397,21 @@ public class AndonManageQueue extends BaseBean { public AndonManageQueue() { } + + public static void main(String[] args) { + try { + List ds = new ArrayList(); + ds.add(new AndonManageQueue()); + + + + System.out.println(BeanUtils.describe(ds)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 220d4a5..4d6bca8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -75,4 +75,11 @@ public class AndonPLC extends BaseBean { @Column(name = "IS_ALARM_STATUS") @ApiParam(value = "是否按灯状态", example = "1") private Integer isAlarmStatus; + + public int getIsAlarmStatusVal(){ + if(isAlarmStatus == null){ + return 0; + } + return isAlarmStatus.intValue(); + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 902b0bc..d21e6d6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -196,15 +196,15 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result); DdlPreparedPack.getInPackArray(obj, "statusCode", result); - getStringBuilderPack(andonManageQueue, result); - - if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){ + if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } + getStringBuilderPack(andonManageQueue, result); // 根据优先级倒序，序号升序排序 - DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, - new String[]{"priorityLevel", "seq"}, result); +// DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, +// new String[]{"priorityLevel", "seq"}, result); + result.setOrderByStr(andonManageQueue.orderBy()); return result; } @@ -418,6 +418,23 @@ public class AndonHqlPack { return result; } + + /** + * 模糊查询安灯子类型信息 + * @param andonAlarmDetailType + * @return + */ + public static DdlPackBean packAndonAlarmDetailTypeLike(AndonAlarmDetailType andonAlarmDetailType) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailName(), "alarmDetailName", result); + + getStringBuilderPack(andonAlarmDetailType, result); + + return result; + } // // /** // * 安灯类型查询条件封装 From cf7957525a436a5e12e2eddae0e95c97389fa809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 5 Jul 2019 16:00:05 +0800 Subject: [PATCH 90/99] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.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/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java index 6864439..6dfc40a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java @@ -42,19 +42,19 @@ public class SapCyco extends SapBase{ @ApiParam(value = "库存状态") @AnnoOutputColumn - private String zstat; + private String zstat=""; @ApiParam(value = "特殊库存标识") @AnnoOutputColumn - private String sobkz; + private String sobkz=""; @ApiParam(value = "项目号") @AnnoOutputColumn - private String zxm; + private String zxm=""; @ApiParam(value = "库存账冻结标志") @AnnoOutputColumn - private String zdjbs; + private String zdjbs=""; @ApiParam(value = "删除标识") @AnnoOutputColumn From 3a19888ddf8757bac0be5452e59d2dbed5fc25f5 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 17:01:17 +0800 Subject: [PATCH 91/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=20=E5=B2=97=E4=BD=8D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4=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/base/bean/DdlPackBean.java | 18 ++++++++++++++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 5fe7b1e..52f3324 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.base.bean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; + import java.util.HashMap; /** @@ -49,6 +52,21 @@ public class DdlPackBean { hqlPreparedMap = new HashMap<>(); } + /** + * 查询制定组织有效的数据 + * @param organizeCode + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + + return result; + } + public boolean isHql() { return isHql; } 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 3c28d85..a80ea62 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 @@ -102,10 +102,10 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); +// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); // String Like DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); From c858475bd24b93fc5f0b8fa7ebfc473f958d3559 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 19:56:10 +0800 Subject: [PATCH 92/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 52f3324..02c6274 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -67,6 +67,15 @@ public class DdlPackBean { return result; } + public static DdlPackBean getDdlPackBean(){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + + return result; + } + public boolean isHql() { return isHql; } 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 a80ea62..43e4101 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 @@ -196,6 +196,17 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + result.setOrderByStr(department.orderBy()); + return result; + } + /** * 系统权限复杂查询 * @param menu From be78ed2636eb7cb8e589d8b304008ff4cd74144d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 22:01:42 +0800 Subject: [PATCH 93/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=80=E5=B8=90=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 2 +- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index aa214c0..af22709 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -144,7 +144,7 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="角色ID" , example = "0") @JsonSerialize(using = ToStringSerializer.class) - private String roleId; + private Long roleId; @Transient @ApiParam(value ="角色ID集合" , example = "0") 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 43e4101..84eef50 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 @@ -470,6 +470,21 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result); + DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + + DdlPreparedPack.getInPackList(idList,"id",result); + result.setOrderByStr(user.orderBy()); + + return result; + } + /** * 账号复杂查询 * @param user @@ -848,6 +863,21 @@ public class CoreHqlPack { return result; } + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + // Number Eq + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(userId,"userId",result); + DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + + // String Eq + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + + return result; + } + /** * 查询当前用户所有组织数据 * @param sysRefUserDepartments From 2aa2dca77f0affe56e18544ed443793aedaa9df1 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 6 Jul 2019 00:25:18 +0800 Subject: [PATCH 94/99] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) 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 84eef50..c24d5f5 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 @@ -228,6 +228,21 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + + result.setOrderByStr(menu.orderBy()); + + return result; + } + /** * 系统角色复杂查询 * @param role @@ -474,7 +489,7 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); @@ -592,6 +607,25 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + // And + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + // Like + DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + + // 添加默认排序 + result.setOrderByStr(userInfo.orderBy()); + + return result; + } + /** * 用户信息 复杂查询拼接 * @param userInfo From 9c189dce3c66f738f426ade827ec4a02c8060059 Mon Sep 17 00:00:00 2001 From: Chnx Date: Sat, 6 Jul 2019 10:08:10 +0800 Subject: [PATCH 95/99] =?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 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 11 +++++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 ++++++- 3 files changed, 18 insertions(+), 6 deletions(-) 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 2abe9b4..f23b64e 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 @@ -136,6 +136,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("条码") private String sn; + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -161,8 +165,8 @@ public class WmsMoveDetails extends BaseBean { 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, + public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode + ,String transTypeName,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; @@ -171,6 +175,7 @@ public class WmsMoveDetails extends BaseBean { this.item = item; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; this.itemStatus = itemStatus; this.unit = unit; this.srcWhNo = srcWhNo; @@ -185,7 +190,5 @@ public class WmsMoveDetails extends BaseBean { 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 f5d2080..5b4030c 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 @@ -126,15 +126,19 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("库位") private String destLocateNo; + @Transient + @ApiParam("交易类型名称") + private String transTypeName; public WmsMoveMaster(){}; - public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,Integer itemStatus, + public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,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.transTypeName = transTypeName; this.itemStatus = itemStatus; this.unit = unit; this.srcWhNo = srcWhNo; 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 884cae5..06a15a7 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 @@ -173,6 +173,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编码") private String vendorNo; + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ @@ -205,7 +209,7 @@ public class WmsMoveSn extends BaseBean { 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, + String transTypeCode,String transTypeName,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; @@ -213,6 +217,7 @@ public class WmsMoveSn extends BaseBean { this.partNo=partNo; this.partNameRdd=partNameRdd; this.transTypeCode=transTypeCode; + this.transTypeName=transTypeName; this.itemStatus=itemStatus; this.unit=unit; this.srcLocateNo=srcLocateNo; From f26cdda8ec493480f822fff244dffd7e7c571e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 6 Jul 2019 16:47:58 +0800 Subject: [PATCH 96/99] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java | 5 +++++ 1 file changed, 5 insertions(+) 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 index 8d22953..6432f58 100644 --- 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 @@ -37,4 +37,9 @@ public class GenerateSnRule { * 存储区来源 */ private Integer zoneSource; + + /** + * 库位来源 + */ + private Integer locateSource; } From 02044789dca555500327c84abfec3819e9707af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 6 Jul 2019 16:57:16 +0800 Subject: [PATCH 97/99] =?UTF-8?q?1.=20TO=20ERP=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=A1=8C=E5=8F=B7=E5=AD=97=E6=AE=B5=202.=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=BC=95=E6=93=8E=20&=20=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BC=95=E6=93=8E=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=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/WmsMoveToERP.java | 4 ++++ .../i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java | 3 ++- .../pojo/wms/repository/IEngineScriptPersistenceRepository.java | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index d65afe3..d8d2132 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -153,6 +153,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否同步") public Integer isSync = CommonEnumUtil.FALSE; + @Column(name="REF_ITEM") + @ApiParam("关联单据行号") + public String refItem; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java index 6074b25..fe96950 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java @@ -15,8 +15,9 @@ import org.springframework.stereotype.Repository; public interface IEngineRulePersistenceRepository extends BaseRepository { /** * 按照规则编号查询规则实体 + * @param organizeCode 工厂代码 * @param ruleNo 规则编号 * @return 规则实体 */ - EngineRulePersistence findByRuleNo(String ruleNo); + EngineRulePersistence findByOrganizeCodeAndRuleNo(String organizeCode, String ruleNo); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index fe7448d..7db7273 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -21,12 +21,12 @@ public interface IEngineScriptPersistenceRepository extends BaseRepository Date: Sat, 6 Jul 2019 17:10:13 +0800 Subject: [PATCH 98/99] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=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/SapRdn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java index a6f4258..67c87da 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java @@ -22,7 +22,7 @@ public class SapRdn extends SapBase{ @ApiParam(value = "Item",example = "1") @AnnoOutputColumn - private Integer posnr; + private String posnr; @ApiParam(value = "收货工厂",example = "1") @AnnoOutputColumn 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 90ac3c0..c796476 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 @@ -204,7 +204,7 @@ public class WmsStockQuan extends BaseBean { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -218,6 +218,8 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.prodCfgTypeCode= prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; From 4350a820433a65e6156a1ee3d646d23040808cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 6 Jul 2019 19:53:40 +0800 Subject: [PATCH 99/99] =?UTF-8?q?1.=20=E5=AE=8C=E5=96=84=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=BC=95=E6=93=8E?= 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 | 8 ++++---- .../pojo/wms/repository/IEngineScriptPersistenceRepository.java | 2 ++ 2 files changed, 6 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 b51bb14..e21d01d 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 @@ -2232,7 +2232,7 @@ public class WmsEnumUtil { */ public enum LANGUAGE_TYPE { GROOVY(1, "Groovy", 10), - PYTHON(2, "Python", 20), + PYTHON(2, "jython", 20), // "jython" string can not change JS(3, "JavaScript", 30); // 下面这2种语言没人会写，暂不支持 //SCALA(40,"scala"), @@ -2242,7 +2242,7 @@ public class WmsEnumUtil { private String description; private int value; - private LANGUAGE_TYPE(int index, String description, int value) { + LANGUAGE_TYPE(int index, String description, int value) { this.index = index; this.description = description; this.value = value; @@ -2261,9 +2261,9 @@ public class WmsEnumUtil { } // 根据枚举编号获取语言代码 - public static String getCodeByIndex(int index) { + public static String getCodeByIndex(Integer index) { for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { - if (languageType.getIndex() == index) { + if (languageType.getValue() == index.intValue()) { return languageType.getDescription(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index 7db7273..8a02ab0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -29,4 +29,6 @@ public interface IEngineScriptPersistenceRepository extends BaseRepository