From a3ccb4d449fd29a8fd7c34efb6efdb3bf43b2c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jul 2019 17:55:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?hql=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 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 15184c4..8e91752 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; @@ -2109,4 +2110,23 @@ public class WmsHqlPack { return result; } + + /** + * 接口映射分页查询条件 + * + * @param wmsInterfaceDataMapper + * @return + */ + public static DdlPackBean packHqlWmsInterfaceDataMapper(WmsInterfaceDataMapper wmsInterfaceDataMapper) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result); + + getStringBuilderPack(wmsInterfaceDataMapper, result); + + return result; + } } From df8d0256684e110e63a180076247916b56619049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jul 2019 17:56:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/WmsInterfaceDataMapperRepository.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java new file mode 100644 index 0000000..4b3a5a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsInterfaceDataMapperRepository extends BaseRepository { +} From 25d8df360d3600fde43daef0d6527c4fcddf8b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 9 Jul 2019 11:11:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9hql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8e91752..5996175 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 @@ -2103,7 +2103,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getInPackList(statusList,"asnStatus",result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); - DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result); + DdlPreparedPack.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 483b93cb9fc5373fb7af4e3f071a271d2853b28c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 9 Jul 2019 11:47:03 +0800 Subject: [PATCH 4/6] bug #4939 #4914 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 3ba7285..8ef0841 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("手机") private String vendorPhone; + + @Transient + @ApiParam("前端信息") + private String message; } 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 8e91752..56f947c 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 @@ -974,6 +974,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); + + DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), + wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true); + DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), + wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true); getStringBuilderPack(wmsMoveMaster, result); return result; From 9a60664fb39aa91c29b149ca30c50fbfedb6556b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 9 Jul 2019 16:00:08 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=9AASN=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=BAAMP?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=8F=8F=E8=BF=B0=E8=A6=81=E7=BB=99?= =?UTF-8?q?AMP=20+BUG:=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=9A=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=AF=E8=83=BD=E6=B2=A1=E6=9C=89=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E9=BB=98=E8=AE=A4=E5=85=A5=E5=BA=93=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index e25c770..f2b2102 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -5,7 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; -import net.bytebuddy.implementation.bind.annotation.Default; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -123,14 +122,6 @@ public class WmsPart extends BaseBean { @ApiParam(value = "默认入库库位") private String inLocateNo; - @Transient - @ApiParam("默认入库存储区") - private String inZoneNo; - - @Transient - @ApiParam("默认入库仓库") - private String inWhNo; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; @@ -169,12 +160,4 @@ public class WmsPart extends BaseBean { this.min = minQty; this.qty = cqty; } - - public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) { - this.partNo = partNo; - this.vendorNo = vendorNo; - this.inLocateNo = inLocateNo; - this.inZoneNo = inZoneNo; - this.inWhNo = inWhNo; - } } From 6a2b19d3e3093a400df2bf439c90c20289e5ffd9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 9 Jul 2019 17:50:01 +0800 Subject: [PATCH 6/6] bug #4953 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++++++ 1 file changed, 6 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 91a2e34..7803190 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 @@ -809,6 +809,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); 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.COMMING.getValue()}, "snStatus", result); + } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result);