From 3a19888ddf8757bac0be5452e59d2dbed5fc25f5 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 17:01:17 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=20=E5=B2=97=E4=BD=8D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 18 ++++++++++++++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 5fe7b1e..52f3324 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.base.bean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; + import java.util.HashMap; /** @@ -49,6 +52,21 @@ public class DdlPackBean { hqlPreparedMap = new HashMap<>(); } + /** + * 查询制定组织有效的数据 + * @param organizeCode + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + + return result; + } + public boolean isHql() { return isHql; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 3c28d85..a80ea62 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -102,10 +102,10 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); +// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); // String Like DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); From c858475bd24b93fc5f0b8fa7ebfc473f958d3559 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 19:56:10 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 52f3324..02c6274 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -67,6 +67,15 @@ public class DdlPackBean { return result; } + public static DdlPackBean getDdlPackBean(){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + + return result; + } + public boolean isHql() { return isHql; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index a80ea62..43e4101 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -196,6 +196,17 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + result.setOrderByStr(department.orderBy()); + return result; + } + /** * 系统权限复杂查询 * @param menu From be78ed2636eb7cb8e589d8b304008ff4cd74144d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 22:01:42 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=80=E5=B8=90=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 2 +- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index aa214c0..af22709 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -144,7 +144,7 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="角色ID" , example = "0") @JsonSerialize(using = ToStringSerializer.class) - private String roleId; + private Long roleId; @Transient @ApiParam(value ="角色ID集合" , example = "0") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 43e4101..84eef50 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -470,6 +470,21 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result); + DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + + DdlPreparedPack.getInPackList(idList,"id",result); + result.setOrderByStr(user.orderBy()); + + return result; + } + /** * 账号复杂查询 * @param user @@ -848,6 +863,21 @@ public class CoreHqlPack { return result; } + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + // Number Eq + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(userId,"userId",result); + DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + + // String Eq + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + + return result; + } + /** * 查询当前用户所有组织数据 * @param sysRefUserDepartments From 2aa2dca77f0affe56e18544ed443793aedaa9df1 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 6 Jul 2019 00:25:18 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 84eef50..c24d5f5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -228,6 +228,21 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + + result.setOrderByStr(menu.orderBy()); + + return result; + } + /** * 系统角色复杂查询 * @param role @@ -474,7 +489,7 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); @@ -592,6 +607,25 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + // And + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + // Like + DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + + // 添加默认排序 + result.setOrderByStr(userInfo.orderBy()); + + return result; + } + /** * 用户信息 复杂查询拼接 * @param userInfo From 9c189dce3c66f738f426ade827ec4a02c8060059 Mon Sep 17 00:00:00 2001 From: Chnx Date: Sat, 6 Jul 2019 10:08:10 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 11 +++++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 ++++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 2abe9b4..f23b64e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -136,6 +136,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("条码") private String sn; + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -161,8 +165,8 @@ public class WmsMoveDetails extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode, - Integer itemStatus,String unit,String srcWhNo, + public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode + ,String transTypeName,Integer itemStatus,String unit,String srcWhNo, String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo, Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){ this.organizeCode = organizeCode; @@ -171,6 +175,7 @@ public class WmsMoveDetails extends BaseBean { this.item = item; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; this.itemStatus = itemStatus; this.unit = unit; this.srcWhNo = srcWhNo; @@ -185,7 +190,5 @@ public class WmsMoveDetails extends BaseBean { this.vendorNo = vendorNo; this.custNo = custNo; - - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index f5d2080..5b4030c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -126,15 +126,19 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("库位") private String destLocateNo; + @Transient + @ApiParam("交易类型名称") + private String transTypeName; public WmsMoveMaster(){}; - public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,Integer itemStatus, + public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; this.itemStatus = itemStatus; this.unit = unit; this.srcWhNo = srcWhNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 884cae5..06a15a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -173,6 +173,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编码") private String vendorNo; + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ @@ -205,7 +209,7 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, - String transTypeCode,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, + String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, Integer destSnStatus, String lotNo,String dateCode){ this.organizeCode=organizeCode; this.orderNo=orderNo; @@ -213,6 +217,7 @@ public class WmsMoveSn extends BaseBean { this.partNo=partNo; this.partNameRdd=partNameRdd; this.transTypeCode=transTypeCode; + this.transTypeName=transTypeName; this.itemStatus=itemStatus; this.unit=unit; this.srcLocateNo=srcLocateNo; From f26cdda8ec493480f822fff244dffd7e7c571e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 6 Jul 2019 16:47:58 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java index 8d22953..6432f58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java @@ -37,4 +37,9 @@ public class GenerateSnRule { * 存储区来源 */ private Integer zoneSource; + + /** + * 库位来源 + */ + private Integer locateSource; } From 02044789dca555500327c84abfec3819e9707af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 6 Jul 2019 16:57:16 +0800 Subject: [PATCH 07/17] =?UTF-8?q?1.=20TO=20ERP=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=A1=8C=E5=8F=B7=E5=AD=97=E6=AE=B5=202.=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=BC=95=E6=93=8E=20&=20=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BC=95=E6=93=8E=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++++ .../i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java | 3 ++- .../pojo/wms/repository/IEngineScriptPersistenceRepository.java | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index d65afe3..d8d2132 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -153,6 +153,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否同步") public Integer isSync = CommonEnumUtil.FALSE; + @Column(name="REF_ITEM") + @ApiParam("关联单据行号") + public String refItem; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java index 6074b25..fe96950 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java @@ -15,8 +15,9 @@ import org.springframework.stereotype.Repository; public interface IEngineRulePersistenceRepository extends BaseRepository { /** * 按照规则编号查询规则实体 + * @param organizeCode 工厂代码 * @param ruleNo 规则编号 * @return 规则实体 */ - EngineRulePersistence findByRuleNo(String ruleNo); + EngineRulePersistence findByOrganizeCodeAndRuleNo(String organizeCode, String ruleNo); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index fe7448d..7db7273 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -21,12 +21,12 @@ public interface IEngineScriptPersistenceRepository extends BaseRepository Date: Sat, 6 Jul 2019 17:10:13 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java index a6f4258..67c87da 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java @@ -22,7 +22,7 @@ public class SapRdn extends SapBase{ @ApiParam(value = "Item",example = "1") @AnnoOutputColumn - private Integer posnr; + private String posnr; @ApiParam(value = "收货工厂",example = "1") @AnnoOutputColumn diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 90ac3c0..c796476 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -204,7 +204,7 @@ public class WmsStockQuan extends BaseBean { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -218,6 +218,8 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.prodCfgTypeCode= prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; From 4350a820433a65e6156a1ee3d646d23040808cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 6 Jul 2019 19:53:40 +0800 Subject: [PATCH 09/17] =?UTF-8?q?1.=20=E5=AE=8C=E5=96=84=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=BC=95=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 ++++---- .../pojo/wms/repository/IEngineScriptPersistenceRepository.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b51bb14..e21d01d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2232,7 +2232,7 @@ public class WmsEnumUtil { */ public enum LANGUAGE_TYPE { GROOVY(1, "Groovy", 10), - PYTHON(2, "Python", 20), + PYTHON(2, "jython", 20), // "jython" string can not change JS(3, "JavaScript", 30); // 下面这2种语言没人会写，暂不支持 //SCALA(40,"scala"), @@ -2242,7 +2242,7 @@ public class WmsEnumUtil { private String description; private int value; - private LANGUAGE_TYPE(int index, String description, int value) { + LANGUAGE_TYPE(int index, String description, int value) { this.index = index; this.description = description; this.value = value; @@ -2261,9 +2261,9 @@ public class WmsEnumUtil { } // 根据枚举编号获取语言代码 - public static String getCodeByIndex(int index) { + public static String getCodeByIndex(Integer index) { for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { - if (languageType.getIndex() == index) { + if (languageType.getValue() == index.intValue()) { return languageType.getDescription(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index 7db7273..8a02ab0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -29,4 +29,6 @@ public interface IEngineScriptPersistenceRepository extends BaseRepository Date: Mon, 8 Jul 2019 13:31:55 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b51bb14..d470278 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 @@ -434,7 +434,8 @@ public class WmsEnumUtil { public enum OUT_MOVEMENT_MOVE_TYPE { IN_STORE(10, "IN", "入库"), OUT_STORE(20, "OUT", "出库"), - MOVE_STORE(30, "MOVE", "移库"); + MOVE_STORE(30, "MOVE", "移库"), + OTHER(40, "OTHER", "其他"); private int value; private String code; @@ -503,10 +504,10 @@ public class WmsEnumUtil { NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"), - ASN(190, "ASN", "ASN"), - PO(200, "PO", "PO"), - QC(210, "QC", "QC"), - AMPR(220, "AMPR", "AMPR"); + ASN(200, "ASN", "ASN"), + PO(210, "PO", "PO"), + QC(220, "QC", "QC"), + AMPR(230, "AMPR", "AMPR"); private int value; From 2a587524ff9e4b4f28955308427d11b6d4051e0d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 8 Jul 2019 15:00:30 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=93=8D=E4=BD=9C,?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 +++++++++------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c24d5f5..5a5d5f2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -121,7 +121,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysPositionList(SysPosition position){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(position); // 查询参数封装 DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); @@ -153,7 +153,7 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(organize); // String Like DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); @@ -197,7 +197,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(department); DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); @@ -229,7 +229,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(menu); DdlPreparedPack.getInPackList(idList,"id",result); DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); @@ -272,7 +272,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(role); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); @@ -373,7 +373,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysMessage(SysMessage message){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message); // hql拼接 DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean); @@ -486,7 +486,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); @@ -506,7 +506,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packDdlSysUser(SysUser user){ - DdlPackBean ddlPack = new DdlPackBean(); + DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user); // And X = X DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); @@ -608,7 +608,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo); // And DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); @@ -874,22 +874,20 @@ public class CoreHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile); // and - DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result); // not - DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result); - return ddlPackBean; + return result; } public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(ref); // Number Eq - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); // String Eq DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); @@ -901,8 +899,6 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); // Number Eq - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); DdlPreparedPack.getNumEqualPack(userId,"userId",result); DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); @@ -918,10 +914,8 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ - DdlPackBean packBean = new DdlPackBean(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean); return packBean; } From fea0d476a4e7232082865efbb46634502ecb923d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 8 Jul 2019 15:05:10 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=93=8D=E4=BD=9C,?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 02c6274..ded0d8d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -76,6 +76,18 @@ public class DdlPackBean { return result; } + public static DdlPackBean getDdlPackBean(BaseBean bean){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + if(bean != null){ + result.setOrderByStr(bean.orderBy()); + } + + return result; + } + public boolean isHql() { return isHql; } From b941354087772a7e38d77d330a7af7ed7c56b7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 8 Jul 2019 16:17:36 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java index 6dfc40a..45c09c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java @@ -58,7 +58,7 @@ public class SapCyco extends SapBase{ @ApiParam(value = "删除标识") @AnnoOutputColumn - private String xloek; + private String xloek=""; @ApiParam(value = "年度") @AnnoOutputColumn From 623d17a2ec5086ac09bdff439b75ea79afcf4590 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:38:53 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 9c8029d..c093654 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 @@ -220,6 +220,6 @@ public class WmsDocMovementDetails extends BaseBean { public Integer busiType; @Column(name = "IS_SN") - @ApiParam(value = "条码生成状态", example = "1") + @ApiParam(value = "条码生成状态", example = "20") public Integer isSn; } From 51efe95e86e58f69f87549c8c93c7255e8c35211 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Mon, 8 Jul 2019 17:39:39 +0800 Subject: [PATCH 15/17] pojo --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java | 27 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java | 27 +++++++++++++++++++++ .../pojo/wms/bean/esbio/PublishTopicData.java | 26 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java | 28 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java | 17 +++++++++++++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java 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 c796476..bbce7c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -204,7 +204,7 @@ public class WmsStockQuan extends BaseBean { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) { + 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; @@ -220,6 +220,7 @@ public class WmsStockQuan extends BaseBean { this.lockQty = lockQty; 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; 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 new file mode 100644 index 0000000..f2701b2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +/** + * Created by Administrator on 2019/7/2. + */ +@Data +public class IQ { + + public String SID=""; + + public String TPDESC=""; + + public String RECYMD=""; + + public String RECHMS=""; + + public String XMLCON=""; + + public String ACTFLG=""; + + public String ACTYMD=""; + + public String ACTHMS=""; + +} 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 new file mode 100644 index 0000000..8f8f97c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +/** + * Created by Administrator on 2019/7/2. + */ +@Data +public class OQ { + + public String SID=""; + + public String TPDESC=""; + + public String CREYMD=""; + + public String CREHMS=""; + + public String XMLCON=""; + + public String ACTFLG=""; + + public String ACTYMD=""; + + public String ACTHMS=""; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java new file mode 100644 index 0000000..7e39983 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +@Data +public class PublishTopicData { + + public int TPID =0; + + public String PBNO =""; + + public String TPNO =""; + + public String TPDESC =""; + + public String MESTAB =""; + + public String MESGROP =""; + + public String MESORD =""; + + public String MESPK =""; + + public String PBNAME =""; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java new file mode 100644 index 0000000..8f41909 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +@Data +public class SI_TP { + + public String TPTYP=""; + + public String TPNO=""; + + public String TPDESC=""; + + public String MESTAB=""; + + public String MESGROP=""; + + public String MESPK=""; + + public String ACTTYP=""; + + public String ACTDESC=""; + + public String ENAB=""; + + public String WERKS=""; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java new file mode 100644 index 0000000..da5556e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; +@Data +public class SI_TPMAP { + + public int SEQ=0; + + public String SAPCOL=""; + + public String MESCOL=""; + + public String COLTYP=""; + + public String COLDESC=""; + +} 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 16/17] =?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 17/17] =?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 { +}