From 3f5c28e1af4317930c80b1e321189e1f14aad6ad Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 16 Jul 2019 18:10:15 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E4=BA=A4=E7=BB=84=E4=BB=B6=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A4=8D=E7=9B=98=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1=E5=A2=9E=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 16 ++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) 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 efc024e..af44900 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 @@ -103,6 +103,14 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("是否范围内") public Integer isScope; + @Transient + @ApiParam(value = "实盘箱数", example = "1") + public Long countBoxQty; + + @Transient + @ApiParam(value = "物料数量", example = "1") + public Double sumPartQty; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { @@ -133,4 +141,12 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } + + public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) { + this.countBoxQty = countBoxQty; + this.sumPartQty = sumPartQty; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } 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 7803190..9291e8c 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 @@ -57,9 +57,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -78,9 +78,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -119,7 +119,7 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); @@ -139,7 +139,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -164,7 +164,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); @@ -245,7 +245,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); @@ -266,7 +266,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); @@ -290,7 +290,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); From 6e2cf7095181c9a9d6e79ea14d833baff56953e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 17 Jul 2019 10:03:55 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=A0=A1=E9=AA=8C?= =?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 | 59 ++++++++++++++++++++++ 1 file changed, 59 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 633422a..797e08e 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 @@ -2962,4 +2962,63 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库位校验源库位目标库位参数 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_DEST_LOCATE { + SRC(10, "SRC", "源库位"), + DEST(20, "DEST", "目标库位"); + + private int value; + private String code; + private String description; + + SRC_DEST_LOCATE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public static SRC_DEST_LOCATE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value==(value)) { + return values()[i]; + } + } + return null; + } + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } \ No newline at end of file From 2240819defb48dedaa0fd491bfff11955b4bebfb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jul 2019 14:50:14 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=8F=91=E6=B3=A1=E6=89=93=E7=AE=B1?= =?UTF-8?q?=E5=8C=85=E8=A3=85?= 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 | 1 + 1 file changed, 1 insertion(+) 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 633422a..8722cfe 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 @@ -304,6 +304,7 @@ public class WmsEnumUtil { /** * 产品入库，发运状态 * WMS_产品报工明细信息 ：单据状态 + * WMS_发泡打箱包装 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { From 40e20f7054453531a5f8442d0c2d6c79a2546010 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 17 Jul 2019 18:41:26 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 693435d..ebf60a2 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 @@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + public WmsMoveMaster(){}; public WmsMoveMaster(Long id,String orderNo,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) { + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean { this.destZoneNo = destZoneNo; this.transQty = transQty; this.rejectQty = rejectQty; - + this.fixId = fixId; } From 86d3f8de480d3f023ee584918fd2bba30eff361e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jul 2019 19:16:43 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E6=89=93=E7=AE=B1=E5=8C=85=E8=A3=85job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 76 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 +- .../pojo/wms/repository/WmsPackSnRepository.java | 16 +++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java new file mode 100644 index 0000000..362093a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -0,0 +1,76 @@ +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 : WMS_包装箱条码表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 11:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PACK_SN") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="包装箱条码表",description = "包装箱条码表") +public class WmsPackSn extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam(value = "订单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partNameAdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SID") + @ApiParam("SID") + private Double sId; + + @Column(name = "COMMIT_DATE") + @ApiParam(value = "提交日期") + private String commitDate; + + @Column(name = "COMMIT_TIME") + @ApiParam(value = "提交时间") + private String commitTime; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + /** + * 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS + */ + @Column(name = "SRC") + @ApiParam(value = "单据来源") + private String src; +} 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 2e6e363..20e8a9e 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 @@ -230,8 +230,11 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP库存地") public String erpZoneNo; - public WmsStockSn(){} + @Transient + @ApiParam(value = "目标数量") + public Double destQty; + public WmsStockSn(){} public WmsStockSn(String partNo){ this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java new file mode 100644 index 0000000..87d61ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.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.WmsPackSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 13:36 + * @Modify: + **/ +@Repository +public interface WmsPackSnRepository extends BaseRepository { +} From 4a717ec544ff97a587d3f5521d7570ef960c3562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 17 Jul 2019 20:11:55 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90JOB+?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F=EF=BC=88?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97=EF=BC=89=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 86 ++++++++++++++++- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 20 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 + .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 15 ++- .../pojo/wms/repository/WmsShippingRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 103 ++++++++++++--------- 6 files changed, 194 insertions(+), 50 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.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 919f1a5..4a79b7c 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 @@ -2700,7 +2700,8 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP", "AMP系统"); + AMP("AMP", "AMP系统"), + ZSLD("ZSLD", "直送拉动"); private String value; private String description; @@ -2988,12 +2989,13 @@ public class WmsEnumUtil { public static SRC_DEST_LOCATE codeOf(int value) { for (int i = 0; i < values().length; i++) { - if (values()[i].value==(value)) { + if (values()[i].value == (value)) { return values()[i]; } } return null; } + public String getDescription() { return description; } @@ -3022,4 +3024,84 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 物料结算标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_CLOSE_FLAG { + INTERNAL_SETTLEMENT("1", "内部结算"), + NOMAL_SETTLEMENT("2", "正常结算"); + + private String value; + private String description; + + OUT_CLOSE_FLAG(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 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; + } + } + + /** + * 物料结算方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_CLOSE_TYPE { + OFF_LINE_SETTLEMENT("10", "下线结算"), + PICK_SETTLEMENT("20", "配料结算"); + + private String value; + private String description; + + OUT_CLOSE_TYPE(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 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java new file mode 100644 index 0000000..91cb071 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 定时任务参数解析Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/17 16:25 + * @Modify + */ +@Data +public class WmsJobParamModel implements Serializable { + private String organizeCode; + private List zonesNoList; + private Integer snType; +} 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 f2b2102..ee682ea 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 @@ -134,6 +134,10 @@ public class WmsPart extends BaseBean { @ApiParam("項目结算标识") private String outCloseFlag = "2"; + @Column(name = "OUT_CLOSE_TYPE") + @ApiParam("结算方式") + private String outCloseType; + @Transient @ApiParam("总数量") private Double qty; 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 bbce7c7..7c3fde7 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 @@ -147,6 +147,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "存储区集合") private List zoneList; + @Transient + @ApiParam(value = "移动单条码集合") + private List wmsMoveSnList; + public String getAreaNo() { return areaNo; @@ -204,7 +208,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,String prodCfgTypeCode ,String prodCfgTypeName, Double scrapQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -218,10 +222,11 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; - this.prodCfgTypeCode= prodCfgTypeCode; + this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; @@ -234,7 +239,7 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; } - public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + 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; @@ -254,8 +259,8 @@ public class WmsStockQuan extends BaseBean { 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) { + 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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java new file mode 100644 index 0000000..ba8806c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.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.WmsShipping; +import org.springframework.stereotype.Repository; + +/** + * @Description 对象持久层仓用方法控制(产品发运表) + * @Reference + * @Author dragon + * @CreateDate 2019/7/17 15:54 + * @Modify + */ +@Repository +public interface WmsShippingRepository extends BaseRepository { +} 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 9291e8c..60044b8 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 @@ -85,7 +85,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), - wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true); + wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsDocMovementDetails, result); return result; @@ -177,6 +177,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingDetail * @return */ @@ -208,6 +209,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingAssign * @return */ @@ -413,11 +415,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - if(wmsLocate.getZoneNo() != null){ - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result); + if (wmsLocate.getZoneNo() != null) { + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result); } - // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); @@ -555,6 +557,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); //特殊发货标志 DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); + //单据来源 + DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); getStringBuilderPack(wmsShipping, result); @@ -811,8 +815,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ - WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), - WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); @@ -831,7 +835,7 @@ public class WmsHqlPack { public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result); + DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(), "zoneNo", result); //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); @@ -879,6 +883,7 @@ public class WmsHqlPack { return result; } + /** * 业务：库存表报查询封装 * @@ -891,14 +896,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 "); @@ -914,22 +919,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; } + /** * 业务：物料包装查询封装 * @@ -984,9 +990,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), - wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true); + wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), - wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true); + wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true); getStringBuilderPack(wmsMoveMaster, result); return result; @@ -1132,6 +1138,7 @@ public class WmsHqlPack { /** * 条码状态查询报表查询条件 + * * @param wmsStockSn * @return */ @@ -1152,7 +1159,7 @@ 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){ + if (wmsStockSn.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); } getStringBuilderPack(wmsStockSn, result); @@ -1165,7 +1172,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - result.setWhereAppend(result.getWhereAppend()+" and qty > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and qty > 0 "); getStringBuilderPack(wmsStockQuan, result); return result; @@ -1445,6 +1452,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + + DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); + DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); + if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) { + result.setOrderByStr(wmsStockSn.getOrderByParam()); + } getStringBuilderPack(wmsStockSn, result); return result; } @@ -1561,13 +1575,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; @@ -1575,13 +1590,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); @@ -1600,7 +1616,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 @@ -1613,7 +1629,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; } @@ -1868,7 +1884,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); @@ -1882,7 +1898,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; @@ -1956,6 +1972,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsVendorPart, result); return result; } + /** * 主数据信息 分页查询 * @@ -1965,12 +1982,12 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - if(wmsProdCfgType != null){ + 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); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result; } @@ -2000,11 +2017,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) { + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, String[] parts) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackArray(parts,"partNo",packBean); - DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); + DdlPreparedPack.getInPackArray(parts, "partNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); getStringBuilderPack(wmsPart, packBean); return packBean; @@ -2073,11 +2090,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(); //查询参数封装 @@ -2098,7 +2115,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackList(ids,"id",result); + DdlPreparedPack.getInPackList(ids, "id", result); return result; } @@ -2110,14 +2127,14 @@ public class WmsHqlPack { * @param organizeCode * @return */ - public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList,String organizeCode) { + 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.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result); - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getInPackList(statusList, "asnStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(), "actionStatus", result); + DdlPreparedPack.getNumEqualPack(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); From 1716628563fb798a23289a4fabb5594e1fb2db9e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 18 Jul 2019 11:28:39 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E6=89=93=E7=AE=B1=E5=8C=85=E8=A3=85job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 60044b8..87a2dfa 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 @@ -57,8 +57,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -78,9 +78,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -164,7 +164,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); From 5d7a44cec3dfc6bd7cc0ed1cd418c2fe21bd4685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 18 Jul 2019 14:20:26 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 36 ++++++++++++++++++++++ 1 file changed, 36 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 60044b8..7cc071b 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 @@ -2159,4 +2159,40 @@ public class WmsHqlPack { return result; } + + /** + * 库存条码管理查询条件 + * + * @param wmsStockSn + * @return + */ + public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + + // 物料编码支持多选 + DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + // 存储区 + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + // 库位不为空 + DdlPreparedPack.getStringNotNullPack( "locateNo", result); + // 排除创建及出库状态条码 + if(wmsStockSn.getSnStatus() != null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + } + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + + //数量大于0 + DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + + getStringBuilderPack(wmsStockSn, result); + return result; + } } From 471aec30fe572925109d2159cd789c1562b064f4 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 18 Jul 2019 20:06:07 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=BC=80=E5=8F=91=20WIP=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index 362093a..b092690 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -36,7 +36,7 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料编码") private String partNo; - @Column(name = "PART_NAME") + @Column(name = "PART_NAME_ADD") @ApiParam(value = "物料名称") private String partNameAdd; 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 87a2dfa..c4af34a 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 @@ -122,6 +122,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -875,7 +876,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); From fb743ebafca6bbe7ec2b7b0015bace98df60274d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 14:52:02 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 3 +++ 2 files changed, 4 insertions(+) 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 b790007..97d6198 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 @@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil { 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), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,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); 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 c2ad1d4..f86330b 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 @@ -24,6 +24,9 @@ public class SessionUser implements Serializable { @ApiParam("用户ID") private Long userId; + @ApiParam("设备ID") + private String deviceId; + @ApiParam("用户工号") private String userCode; From 90fb9d3190f39a3c23a883e646ef152cba28d294 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 14:55:01 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0?= =?UTF-8?q?=E5=B0=84=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/base/enumutil/BlockFormEnumUtil.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/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 97d6198..f865993 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 @@ -1168,7 +1168,7 @@ public class BlockFormEnumUtil { 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), - BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), + BIG_DECIMAL(32, "Double", "大浮点型", "java.lang.BigDecimal", Double.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); From 7f35883b08f843b280b7f2d18029d5bb58502fe6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 16:27:38 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 f865993..98616cf 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 @@ -1168,7 +1168,7 @@ public class BlockFormEnumUtil { 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), - BIG_DECIMAL(32, "Double", "大浮点型", "java.lang.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.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); @@ -1321,7 +1321,7 @@ public class BlockFormEnumUtil { public static PROPERTY_TYPE valueOfClassPath(String classPath) { PROPERTY_TYPE tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].classPath == classPath) { + if (values()[i].classPath.equals(classPath)) { tmp = values()[i]; } } From 9a61249756d77f530efd5f7a8b26f2c0d340128e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 19 Jul 2019 13:19:15 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85?= 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 f795d89..1d507ac 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 @@ -2173,6 +2173,7 @@ public class WmsHqlPack { // 物料编码支持多选 DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); // 存储区 DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); @@ -2186,6 +2187,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + //数量大于0 DdlPreparedPack.getNumberBiggerPack(0,"qty",result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); From 0fc49d5b2a8f8c3f7060d46531a56728e1a40ed7 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 19 Jul 2019 13:19:27 +0800 Subject: [PATCH 14/17] =?UTF-8?q?IQ=E3=80=81OQ=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java index f2701b2..303f0cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java @@ -24,4 +24,6 @@ public class IQ { public String ACTHMS=""; + public String WERKS=""; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java index 8f8f97c..89b7bb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java @@ -24,4 +24,6 @@ public class OQ { public String ACTHMS=""; + public String WERKS=""; + } From 8c5f7906afd1272e23a3a78e5dd66de9a6b8a0e0 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 19 Jul 2019 13:37:21 +0800 Subject: [PATCH 15/17] bug #5038 bug #5045 --- .../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 f795d89..ba54f8f 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 @@ -821,6 +821,7 @@ public class WmsHqlPack { WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + result.setWhereAppend(result.getWhereAppend() + " and qty > 0"); getStringBuilderPack(wmsStockSn, result); From 23c4b0742d2a5add4ab9bac37b175a49c02fb83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 19 Jul 2019 18:53:21 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85?= 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 1d507ac..594326e 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 @@ -2180,6 +2180,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); // 库位不为空 DdlPreparedPack.getStringNotNullPack( "locateNo", result); + DdlPreparedPack.getStringNoEqualPack("","locateNo", result); // 排除创建及出库状态条码 if(wmsStockSn.getSnStatus() != null){ DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); From 63d7c2c6b896f17c45d5be502bfbb9344417c2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 20 Jul 2019 17:02:15 +0800 Subject: [PATCH 17/17] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E7=9A=84POJO=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/repository/IEngineScriptPersistenceRepository.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 8a02ab0..de8bf6d 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 @@ -17,18 +17,24 @@ import java.util.List; @Repository public interface IEngineScriptPersistenceRepository extends BaseRepository { /** - * 按照脚本编号查询脚本实体对象 + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 * @param scriptNo 脚本编号 * @return 脚本实体对象 */ EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** * 查找所有的脚本语言类型 * @return 数据库中已经存在的脚本语言类型 */ @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") List findGroupByLanguageType(); - - EngineScriptPersistence findByScriptNo(String scriptNo); }