From 7ac3509f96b05862b47defb832b46c34c509e2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 26 Jun 2019 21:01:43 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?= 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 | 4 +++- 1 file changed, 3 insertions(+), 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 2223392..336fe7a 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 @@ -1129,7 +1129,9 @@ 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){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); + } getStringBuilderPack(wmsStockSn, result); return result; From c783d9119c7c19d3e56cf33d9d83f951e390e8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 27 Jun 2019 14:42:41 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9F=A5=E5=87=BA=E4=BA=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA30=E7=9A=84=E4=BB=BB=E5=8A=A1+=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6execute=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E4=BA=8B=E5=8A=A1=E7=BA=A7=E5=88=AB+?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=90=8D=E6=9F=A5=E6=89=BE=E6=9E=9A=E4=B8=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=9A=84=E9=9D=99=E6=80=81=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 +++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) 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 26be640..da1c060 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 @@ -2,6 +2,12 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @Description : * @Reference : @@ -2564,7 +2570,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_TRANS_QUAN_STATUS { - CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败"); + CREATE(1, "创建"), SUCCESS(10, "处理成功"), FAIL(30, "处理失败"); private int value; private String description; @@ -2699,4 +2705,56 @@ public class WmsEnumUtil { return description; } } + + public static Map getEnumByName(String enumName) throws Exception{ + Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class clazz; + Enum[] enumConstants; + + Map enumMap;// 枚举类 + List> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】 + Map value;// 枚举实例属性 + + Method getValue; + Method getCode; + Method getDescription; + + // 遍历内部类 + String simpleName;//内部类的类名 + for (Class class1 : innerClazz) { + //获取内部内的类名 + simpleName = class1.getSimpleName(); + if (simpleName.equals(enumName)) { + // 判断类是不是枚举类 + clazz = (Class) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName); + + // 枚举类方法初始化 + getCode = null; + try { + getCode = clazz.getMethod("getCode"); + } catch (NoSuchMethodException e) { + } + getValue = clazz.getMethod("getValue"); + getDescription = clazz.getMethod("getDescription"); + + // 获取所有枚举实例 + enumConstants = clazz.getEnumConstants(); + enumMap = new HashMap<>(); + values = new ArrayList<>(); + for (Enum enum1 : enumConstants) { + value = new HashMap<>(); + value.put("value", getValue.invoke(enum1)); + if (getCode != null) { + value.put("code", getCode.invoke(enum1)); + } + value.put("description", getDescription.invoke(enum1)); + values.add(value); + } + enumMap.put("enumName", clazz.getSimpleName()); + enumMap.put("valuesList", values); + return enumMap; + } + } + return null; + } } \ No newline at end of file From 31b7e2d8dcf208176074794b7752aa8e72402ab4 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 27 Jun 2019 16:48:44 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=92=8C=E6=9C=AA=E5=AE=8C=E6=88=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=8A=A5=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/modelbean/WmsMoveUnfinishedOrderModel.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index 7c4f4f1..66eda83 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -25,21 +25,32 @@ public class WmsMoveUnfinishedOrderModel extends BaseBean{ @ApiParam("未完成数量") private Double destQty; - @ApiParam("业务类型") - private Integer busiTypeCode; + @ApiParam("交易类型") private String transTypeCode; + @ApiParam("交易类型名称") + private String transTypeName; + @ApiParam("关联单号") private String refSrc; - public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.refSrc = refSrc; + } + + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; - this.busiTypeCode = busiTypeCode; this.transTypeCode = transTypeCode; this.refSrc = refSrc; } From 1b4e5143aa26b61f284dd3803a2ab854cbb93480 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 27 Jun 2019 17:24:01 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=95=E5=B8=90?= =?UTF-8?q?=E5=8F=B7=E5=A4=9A=E5=B9=B3=E5=8F=B0=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 21 +++++++-------------- .../i3plus/pojo/base/shirotoken/AdminToken.java | 4 ++++ .../i3plus/pojo/base/shirotoken/BaseToken.java | 16 ++++++++++++++++ .../i3plus/pojo/base/shirotoken/SaAdminToken.java | 4 ++++ .../i3plus/pojo/base/shirotoken/UserToken.java | 4 ++++ .../i3plus/pojo/platform/bean/SessionUser.java | 2 -- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1280e58..156a405 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -722,20 +722,13 @@ public class CommonEnumUtil { } /** - * 客户端操作系统 - * return "Windows"; - * return "Mac"; - * return "Unix"; - * return "Android"; - * return "IPhone"; + * 客户端登录标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOG_LOGIN_PLATFORM { - WINDOWS(1, "Windows", "Windows 操作系统"), - MAC(2, "Mac", "Mac 操作系统"), - UNIX(3, "Unix", "Linux 操作系统"), - ANDROID(4, "Android", "Android 操作系统"), - IPHONE(5, "IPhone", "IPhone 操作系统"); + PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"), + PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"), + Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"); private int value; private String name; @@ -762,11 +755,11 @@ public class CommonEnumUtil { return name; } - public static String valueOf(int val) { - String tmp = null; + public static LOG_LOGIN_PLATFORM valueOf(int val) { + LOG_LOGIN_PLATFORM tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].getName(); + tmp = values()[i]; } } return tmp; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java index 16eca8d..85dafe5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java @@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken; **/ public class AdminToken extends BaseToken { + public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } + public AdminToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java index 86c236a..2ba35cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java @@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken { private String loginName; private String loginPwd; private String languageCode; + private Integer loginPlatform; public BaseToken(String loginName, String loginPwd, String languageCode) { this.loginName = loginName; @@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken { this.languageCode = languageCode; } + public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + this.loginName = loginName; + this.loginPwd = loginPwd; + this.languageCode = languageCode; + this.loginPlatform = loginPlatform; + } + //身份 @Override public Object getPrincipal() { @@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken { public void setLanguageCode(String languageCode) { this.languageCode = languageCode; } + + public Integer getLoginPlatform() { + return loginPlatform; + } + + public void setLoginPlatform(Integer loginPlatform) { + this.loginPlatform = loginPlatform; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java index 0d4e1fe..8cee322 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java @@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken { public SaAdminToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } + + public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java index 84a10d1..9d6cf59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java @@ -12,4 +12,8 @@ public class UserToken extends BaseToken { public UserToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } + + public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } } 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 59baf96..3ee307d 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 @@ -16,8 +16,6 @@ import java.util.List; @Data public class SessionUser implements Serializable { - private static final long serialVersionUID = 1L; - @ApiParam("用户ID") private Long userId; From 557880ffd2fc1d7f6667af94267285bb9df906b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 27 Jun 2019 17:29:26 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93=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/WmsDocFgDetail.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 7b4f672..ac6e53d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -58,7 +58,7 @@ public class WmsDocFgDetail extends BaseBean { public String partNo; @Column(name="PART_NAME_RDD") - @ApiParam("单位") + @ApiParam("物料名称") public String partNameRdd; @Column(name="BOM_UPDATE") @@ -123,4 +123,8 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="IS_LOCK") @ApiParam(value = "是否锁定", example = "2") public Integer isLock; + + @Column(name="REMARK") + @ApiParam("备注") + public String remark; } From e7bd528736ac4be80d0597757a408803817aa35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 27 Jun 2019 17:50:25 +0800 Subject: [PATCH 06/12] =?UTF-8?q?1.=20=E8=AE=BE=E7=BD=AE=20is=5Fsync=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=202?= 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 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 6c4d1c7..67473bd 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -148,9 +149,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("交易类型") public Integer busiTypeCode; - @Column(name = "IS_SYNC") + @Column(name = "IS_SYNC", nullable = false) @ApiParam("是否同步") - public Integer isSync; + public Integer isSync = CommonEnumUtil.FALSE; @ApiParam(value = "待出库数量", example = "0") @Transient From 2eba4bb74586b28c7b4934d084561bd7258d0584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 27 Jun 2019 18:08:32 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index e719404..6da63b3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -43,6 +43,14 @@ public class SysFile extends BaseBean { @ApiParam(value ="文件所属模块") private Integer fileSoftType; + public int getFileSoftTypeVal(){ + if(fileSoftType == null){ + return 0; + } + + return fileSoftType.intValue(); + } + @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -83,5 +91,4 @@ public class SysFile extends BaseBean { @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") private Integer downloadNum; - } From 6f41158ecb432a43ad270aba759291178799dfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 27 Jun 2019 20:15:11 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index c777851..f977ae9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -85,4 +85,8 @@ public class WmsShipping extends BaseBean { @Transient @ApiParam(value = "发往地简称") private String flagName; + + @Column(name="AREA_NO") + @ApiParam("ERP库存地") + public String areaNo; } 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 2223392..709c651 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 @@ -2051,4 +2051,18 @@ public class WmsHqlPack { return result; } + /** + * 根据id集合查询生产报工明细表的数据 + * + * @param ids + * @return + */ + public static DdlPackBean packHqlWmsDocFgDetail(List ids) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(ids,"id",result); + + return result; + } } From b98b48e4e5dc0ec6e8a5f99634a9454b74920f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 27 Jun 2019 20:56:45 +0800 Subject: [PATCH 09/12] =?UTF-8?q?SAP=5F=E4=BA=A7=E5=93=81=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=B1=87=E6=80=BB=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 136 +++++++++++++++++++++ .../pojo/wms/repository/SapDocFgSumRepository.java | 17 +++ 2 files changed, 153 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java new file mode 100644 index 0000000..a81ce3d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -0,0 +1,136 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :SAP_产品报工汇总表 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-27 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SAP_DOC_FG_SUM") +@Api("SAP_产品报工汇总表") +public class SapDocFgSum extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="PART_NO") + @ApiParam(value = "物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("单位") + public String partNameRdd; + + @Column(name="QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="ERP_WORK_CENTER") + @ApiParam("ERP_工作中心") + public String erpWorkCenter; + + @Column(name="IN_AREA_NO") + @ApiParam("入库ERP库存地") + public String inAreaNo; + + @Column(name="ITEM_PART_NO") + @ApiParam("子物料号") + public String itemPartNo; + + @Column(name="ITEM_PART_NAME") + @ApiParam("子料物料描述") + public String itemPartName; + + @Column(name="ITEM_UNIT") + @ApiParam("子计量单位") + public String itemUnit; + + @Column(name="ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子用量", example = "0") + public Double itemQty; + + @Column(name="OUT_AREA_NO") + @ApiParam("消耗ERP库存地") + public String outAreaNo; + + /** + * 状态:10=新建,20=已处理,30=处理出错 + */ + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 + */ + @Column(name="SRC") + @ApiParam("单据来源") + public String src; + + /** + * 是否锁定：1=锁定 2=未锁定 + */ + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "BOM生效日期") + @Column(name = "EFF_START_TIME") + private String effStartTime; + + @JsonSerialize(using = ToStringSerializer.class) + @Transient + public Long wdfdId; + + public SapDocFgSum(){} + public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java new file mode 100644 index 0000000..02ebe5d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.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.SapDocFgSum; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-27 20:19 + * @Modify: + **/ +@Repository +public interface SapDocFgSumRepository extends BaseRepository { + +} From 0962b810ce488f3b068b00c88f13421cc17c0869 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 27 Jun 2019 21:42:30 +0800 Subject: [PATCH 10/12] =?UTF-8?q?Json=20=E8=BD=AC=E6=8D=A2=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 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 102685a..9730fb8 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 @@ -1162,15 +1162,15 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL); -// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME); + STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + 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), + 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); /** * 属性类型值 @@ -1202,7 +1202,12 @@ public class BlockFormEnumUtil { */ private SQL_WHERE defaultWhere; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + /** + * 默认查询关系 + */ + private String defaultValue; + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1210,6 +1215,7 @@ public class BlockFormEnumUtil { this.clzFullName = clzFullName; this.controlType = controlType; this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; } public int getValue() { From 72ef115db879afe9f676645931e85b6432aaa919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 27 Jun 2019 22:03:10 +0800 Subject: [PATCH 11/12] =?UTF-8?q?1.=20=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 23eb182..20a2d07 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 @@ -64,25 +64,25 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name = "LOT_NO") + @Column(name = "LOT_NO", nullable = false) @ApiParam("收货日期（批次编码）") - public String lotNo; + public String lotNo = ""; - @Column(name = "DATE_CODE") + @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "生产日期") - public String dateCode; + public String dateCode = ""; - @Column(name = "LEFT_CODE") + @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "有效期") - private String leftCode; + private String leftCode = ""; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "FIX_LOT_NO") + @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") - private String fixLotNo; + private String fixLotNo = ""; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") From f85a0296ae8762825bab4520a5633b75ea10c909 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 27 Jun 2019 22:20:24 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=BC=80=E5=8F=91=20bom=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 0962326..536be05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -90,4 +90,12 @@ public class WmsBom extends BaseBean { public Double getItemQty() { return this.itemQty == null ? 0 : this.itemQty.doubleValue(); } + + public WmsBom(){} + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + } } 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 23eb182..9d3b5f5 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 @@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "客户条码") private String custSn; + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd;