From 6a3662283b7f3b7ace6f6d4eb635dc57f2cb3956 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 13:31:55 +0800 Subject: [PATCH 1/2] =?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 2/2] =?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; }