From e13d4163b7052b04343b1a6c9cd1ab206e89874f Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 25 Jun 2019 11:14:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= 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/WmsTransQuan.java | 33 ++++++++++++++++++++ 2 files changed, 68 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 853cc70..4fbe6ba 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 @@ -2547,4 +2547,39 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 库存交易表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_TRANS_QUAN_STATUS { + CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败"); + + private int value; + private String description; + + WMS_TRANS_QUAN_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index aa23e71..329b3a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -153,4 +153,37 @@ public class WmsTransQuan extends BaseBean { @Transient @ApiParam("存储区名称") private String zoneName; + + @Transient + @ApiParam("库存地代码") + private String areaNo; + + public WmsTransQuan(){} + + public WmsTransQuan(String organizeCode,String partNo,String partNameRdd,String transCode,String unit,String whNo,String zoneNo, + Double qty,Double failQty,Double holdQty,Double scrapQty,Double qcQty,Double rinQty, + Double freezeQty,Double consignQty,Double lockQty){ + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transCode = transCode; + this.unit = unit; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.scrapQty = scrapQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + + } + + + public WmsTransQuan(Integer transStatus){ + this.transStatus = transStatus; + } } From 71f6d48d16778360fe8fb8b94b0c7117fa96b0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 25 Jun 2019 11:59:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E5=AE=9E=E4=BD=93--=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 920e62f..ad81aec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -43,6 +43,12 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("列表信息") public List informations; + public List getInformations(){ + if(informations == null){ + informations= new ArrayList<>(); + } + return informations; + } public void setInformation(List list){ if(list == null){ list = new ArrayList<>(); @@ -52,6 +58,12 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("可选项") public List options; + public List getOptions(){ + if(options == null){ + options = new ArrayList<>(); + } + return options; + } public void setOptions(List opt){ if(opt == null){ opt = new ArrayList<>(); From d0d9a467a31d6dce9f9483be259aaa9c2675cc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 25 Jun 2019 15:07:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E5=AD=97=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 | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- 4 files changed, 4 insertions(+), 4 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 913e031..c734ff1 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 @@ -122,7 +122,7 @@ public class WmsASNMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; @Transient @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 7c8267c..67377b4 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 @@ -209,5 +209,5 @@ public class WmsDocMovementDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index e6e934f..314e492 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -146,7 +146,7 @@ public class WmsPOMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - private transient int lockVersion; + private transient Integer lockVersion; @Transient @ApiParam("PO条码总箱数") 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 f7ed231..d7e8232 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 @@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; } From 4309454d2a10ef70927f58520eca459fd576bac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 25 Jun 2019 15:15:41 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=20EXCEL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 6b6f7c2..1575b05 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 @@ -84,6 +84,7 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); getStringBuilderPack(mesWorkCell, 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 60eec44..6dc423e 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 @@ -247,7 +247,7 @@ public class AndonEnumUtil { EQUIP("EQUMENT_ALARM","设备"), PROCESS("ROUTING_ALARM","工艺"), CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "设备故障"); + FIX_ERROR("FIX_ERROR", "自动报警"); private String value; private String description; From e3d5e5bb19745e50c210f27d8d48b9f5ead483c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 25 Jun 2019 18:51:45 +0800 Subject: [PATCH 5/8] =?UTF-8?q?PDA=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8+=E7=9B=98=E7=82=B9=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=A7=BB=E5=8A=A8=E6=98=8E=E7=BB=86=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 +++ .../i3plus/pojo/model/wms/WmsTaskInfoModel.java | 47 +++++++++++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 2 +- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 67 ++++++++++++---------- 6 files changed, 91 insertions(+), 39 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 853cc70..d4bb7e2 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 @@ -1761,6 +1761,15 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static DATA_OBJ_TYPE codeOf(Integer val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** 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 0e72b17..b20df0e 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -16,19 +17,55 @@ import java.io.Serializable; public class WmsTaskInfoModel implements Serializable { @ApiParam("任务单号") public String orderNo; - - @ApiParam("关联单号") - public String refSrc; - + @Column(name = "TRANS_TYPE_CODE") /** * 状态:1=创建,10=待处理,20=已处理 */ @ApiParam(value = "任务状态") - public String taskStatus; + public Integer taskStatus; @ApiParam("作业类型名称") public String opTypeName; + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam("关联单号") + public String refSrc; + @ApiParam(value = "关联单据类型") private String refType; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + public WmsTaskInfoModel() { + } + + public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, + String refType, 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.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 1198e5b..8670c4a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -34,7 +34,7 @@ public class WmsDataAuth extends BaseBean { @Column(name = "DATA_OBJ") @ApiParam(value = "数据对象") - private String dataObj; + private Integer dataObj; @Column(name = "DATA_OBJ_VALUE") @ApiParam(value = "数据对象值") 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("物料编码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 8442671..20c7692 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** @@ -23,7 +22,7 @@ public class WmsDataAuthModel extends BaseBean { private String roleCode; @ApiParam("数据对象") - private String dataObj; + private Integer dataObj; @ApiParam("数据对象值") private String dataObjValue; 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 ead2da2..80c4490 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 @@ -170,6 +170,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingDetail * @return */ @@ -201,6 +202,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingAssign * @return */ @@ -651,6 +653,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + DdlPreparedPack.getStringEqualPack(wmsTaskInfo.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsTaskInfo, result); @@ -859,6 +862,7 @@ public class WmsHqlPack { return result; } + /** * 业务：库存表报查询封装 * @@ -871,14 +875,14 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", findWhere); HqlPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", findWhere); HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", findWhere); - if(wmsStockQuan.getZoneNo() != null){ - HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getZoneNo().split(","))),","),"",findWhere); + if (wmsStockQuan.getZoneNo() != null) { + HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getZoneNo().split(","))), ","), "", findWhere); //DdlPreparedPack.getInPackArray(wmsStockQuan.getZoneNo().split(","), "zoneNo", result); } - if(wmsStockQuan.getPartNo() != null){ - HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getPartNo().split(","))),","),"partNo",findWhere); + if (wmsStockQuan.getPartNo() != null) { + HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getPartNo().split(","))), ","), "partNo", findWhere); } - if(!wmsStockQuan.getIncludeZeroStock()){ + if (!wmsStockQuan.getIncludeZeroStock()) { //含0库存显示，默认为否 //自定义条件，各汇总数量相加。为否时添加>0的条件判断 findWhere.append(" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); @@ -894,22 +898,23 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - if(wmsStockQuan.getZoneNo() != null){ + if (wmsStockQuan.getZoneNo() != null) { DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result); } - if(wmsStockQuan.getPartNo() != null){ + if (wmsStockQuan.getPartNo() != null) { DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result); } - if(!wmsStockQuan.getIncludeZeroStock()){ + if (!wmsStockQuan.getIncludeZeroStock()) { //含0库存显示，默认为否 //自定义条件，各汇总数量相加。为否时添加>0的条件判断 - result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); } getStringBuilderPack(wmsStockQuan, result); return result; } + /** * 业务：物料包装查询封装 * @@ -1431,9 +1436,8 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); - DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); -// String data = String.join(",", roleIds); + DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result); + DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getInPackList(roleIds, "roleCode", result); getStringBuilderPack(dataAuth, result); return result; @@ -1493,13 +1497,14 @@ public class WmsHqlPack { /** * 把 List 中的一组数据重新封装到List中 + * * @param mapList * @param keyName */ - private static List cyclicTraversal(List mapList,String keyName) { + private static List cyclicTraversal(List mapList, String keyName) { List list = new ArrayList(); - for(int i=0;i map = mapList.get(i); + for (int i = 0; i < mapList.size(); i++) { + Map map = mapList.get(i); list.add(map.get(keyName)); } return list; @@ -1507,13 +1512,14 @@ public class WmsHqlPack { /** * 把 List 中的一组查询条件封装成 HQL + * * @param mapList * @param keyName * @param columnName * @param packBean */ - private static void packMutilConditionHql(List mapList, String keyName,String columnName, DdlPackBean packBean) { - int index = 1; + private static void packMutilConditionHql(List mapList, String keyName, String columnName, DdlPackBean packBean) { + int index = 1; String columnParam = null; for (Map item : mapList) { columnParam = columnName + String.valueOf(index); @@ -1532,7 +1538,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList,Map> groupDataAuth) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql @@ -1545,7 +1551,7 @@ public class WmsHqlPack { if (StringUtils.isNotBlank(data)) { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) { - DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"TRANS_TYPE_CODE"), "transTypeCode", packBean); + DdlPreparedPack.getInPackList(cyclicTraversal(mapList, "TRANS_TYPE_CODE"), "transTypeCode", packBean); //packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean); break; } @@ -1580,8 +1586,8 @@ public class WmsHqlPack { if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) { DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) { - DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); + if (wmsDataAuth.getDataObj() != null && wmsDataAuth.getDataObj().intValue() != 0) { + DdlPreparedPack.getNumEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); @@ -1800,7 +1806,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); - result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''"); + result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); getStringBuilderPack(wmsStockSn, result); @@ -1814,7 +1820,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); getStringBuilderPack(wmsStockQuan, result); return result; @@ -1888,6 +1894,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsVendorPart, result); return result; } + /** * 主数据信息 分页查询 * @@ -1899,8 +1906,8 @@ public class WmsHqlPack { //查询参数封装 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); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result; } @@ -1930,11 +1937,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List partNoList) { + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, List partNoList) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean); - DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); + DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); getStringBuilderPack(wmsPart, packBean); return packBean; @@ -2002,11 +2009,11 @@ public class WmsHqlPack { * 根据存储区编号集合、库位类型查询库位信息 * * @param zoneNoList - *@param wmsZones + * @param wmsZones * @param locateType * @return */ - public static DdlPackBean packLocateNoByZoneNo(List zoneNoList , WmsZones wmsZones , Integer locateType) { + public static DdlPackBean packLocateNoByZoneNo(List zoneNoList, WmsZones wmsZones, Integer locateType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 From 8ba21737530ddf10fca8907e6b46eda0a640b711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 25 Jun 2019 19:34:25 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=86=B2=E7=AA=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, 3 insertions(+), 3 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 d924728..0d6a6a4 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 @@ -1963,11 +1963,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, List partNoList) { + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getInPackArray(parts,"partNo",packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); getStringBuilderPack(wmsPart, packBean); return packBean; From 0f3d67d1103ff58262939bab3b49623717c9f6f3 Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Tue, 25 Jun 2019 19:41:44 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=9C=8B=E6=9D=BF=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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 57 +++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 16 +++++ .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 84 ++++++++++++++++++++++ .../wms/repository/WmsWorkCenterRepository.java | 2 + .../repository/WmsWorkCenterZoneRepository.java | 2 + 5 files changed, 161 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.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 853cc70..a53176c 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 @@ -2547,4 +2547,61 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * PO ASN 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_RECEIVE_STATUS { + WAITING_RECEIVE_TIME_EARLY("R0001", "待收货"), + RECEIVEING_TIME_EARLY("R0002", "提前收货中"), + RECEIVED_IIME_EARLY("R0003", "提前收货完成"), + WAITING_RECEIVE_TIME_IN("R0004", "待收货"), + RECEIVEING_TIME_IN("R0005", "正常收货中"), + RECEIVED_TIME_IN("R0006", "正常收货完成"), + WAITING_RECEIVE_TIME_LATE("R0007", "延迟未收货"), + RECEIVEING_TIME_LATE("R0008", "延迟收货中"), + RECEIVED_TIME_LATE("R0009", "延迟收货完成"), + STATUS_NEED_TO_CHECK("R0010", "待查询"); + + private String value; + private String description; + + PO_RECEIVE_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + public static PO_RECEIVE_STATUS codeOf(String value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + return values()[i]; + } + } + return null; + } + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index e90728d..e51bbaa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -119,4 +119,20 @@ public class WmsPoSn extends BaseBean { @Transient @ApiParam(value = "工厂名称") public String organizeName; + + @Transient + @ApiParam(value = "最早收货时间") + public String earliestReceTime; + + @Transient + @ApiParam(value = "最晚收货时间") + public String latestReceTime; + + public WmsPoSn(){} + + public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ + this.orderNo = orderNo; + this.earliestReceTime = earliestReceTime; + this.latestReceTime = latestReceTime; + } } 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 new file mode 100644 index 0000000..e380985 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.time.LocalTime; + +/** + * @Description : 供应商收货看板信息 + * @Reference : + * @Author : sky.meng + * @CreateDate : 2019-06-24 15:04 + * @Modify: + **/ +@Data +@Api("供应商收货看板") +public class WmsPoAsnRecvModel extends BaseBean implements Comparable{ + + @ApiParam("订单号") + private String orderNo; + @ApiParam("供应商名称") + private String vendorName; + @ApiParam("收货通道") + private String dock; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("项目名称") + private String prodCfgTypeName; + @ApiParam("计划收货日期") + private String planDate; + @ApiParam("计划收货时间") + private String planTime; + @ApiParam("总数量") + private Double qty; + @ApiParam("已收货数量") + private Double recQty; + @ApiParam("最早收货时间") + private String earliestReceTime; + @ApiParam("最晚收货时间") + private String latestReceTime; + @ApiParam("供应商号码") + private String vendorNo; + @ApiParam("物料") + private String partNo; + @ApiParam("收货状态") + private String receiveStatus; + + public WmsPoAsnRecvModel(String orderNo,String dock,String vendorNo,String prodCfgTypeCode, String prodCfgTypeName,String planDate,String planTime,Double qty,Double recQty){ + this.orderNo = orderNo; + this.dock = dock; + this.planDate = planDate; + this.planTime = planTime; + this.qty = qty; + this.recQty = recQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.vendorNo = vendorNo; + + } + public WmsPoAsnRecvModel(String orderNo,String dock,String planDate,String planTime){ + this.orderNo = orderNo; + this.dock = dock; + this.planDate = planDate; + this.planTime = planTime; + } + public WmsPoAsnRecvModel(){} + + @Override + public int compareTo(WmsPoAsnRecvModel o) { + return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0; + } + + public static LocalTime getLocalTime(String planTime){ + LocalTime time = null; + try { + time = LocalTime.parse(planTime); + }catch (Exception e){ + e.printStackTrace(); + } + return time; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java index b662fb2..a6a06a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.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.WmsWorkCenter; +import org.springframework.stereotype.Repository; /** * @Description : 产线信息管理(工作中心) @@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter; * @CreateDate : 2019-06-19 16:20 * @Modify: **/ +@Repository public interface WmsWorkCenterRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java index 071dfd4..1d79a06 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.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.WmsWorkCenterZone; +import org.springframework.stereotype.Repository; /** * @Description : 产线(工作中心)-存储区信息管理 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone; * @CreateDate : 2019-06-20 14:55 * @Modify: **/ +@Repository public interface WmsWorkCenterZoneRepository extends BaseRepository { } From b13a9cd79c9fac9bc62e5c004921628cc63b90c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 25 Jun 2019 20:54:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?PDA=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8+=E7=9B=98=E7=82=B9=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=A7=BB=E5=8A=A8=E6=98=8E=E7=BB=86=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98?= 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 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 0d6a6a4..fc513e2 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 @@ -1466,7 +1466,6 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result); - DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(roleIds, "roleCode", result); getStringBuilderPack(dataAuth, result); return result;