From 8b6271cebc7e6cf7987098841808c9a5cbb1a445 Mon Sep 17 00:00:00 2001 From: alwaysfrin Date: Tue, 1 Sep 2020 13:09:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?1=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96=202?= =?UTF-8?q?=EF=BC=8C=E8=AF=BB=E5=86=99=E5=88=86=E7=A6=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=87=E6=8D=A2=E4=BC=98=E5=8C=96=203=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=87=E9=9D=A2=E4=BC=98=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4=204=EF=BC=8C=E7=99=BB=E9=99=86=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96=205=EF=BC=8C=E5=AF=B9=E8=B1=A1=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E7=9B=91=E5=90=AC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 1 + .../i3plus/pojo/base/bean/BaseBeanListener.java | 90 +++++++++++++ .../i3plus/pojo/base/bean/BaseThreadLocal.java | 142 +++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 36858cc..a517b70 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -25,6 +25,7 @@ import java.util.Map; **/ @Data @MappedSuperclass +@EntityListeners(BaseBeanListener.class) //对象状态监听 //@Entity //以子类table为准 //@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java new file mode 100644 index 0000000..95889dc --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import org.apache.commons.lang3.StringUtils; + +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @Description : 实体对象监听 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2020-08-24 22:28 + * @Modify: + **/ +public class BaseBeanListener { + + //实体保存前 + @PrePersist + public void prePersist(BaseBean baseBean) { + // 创建用户 + if (StringUtils.isBlank(baseBean.getCreateUser())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadEmpName())) { + baseBean.setCreateUser(BaseThreadLocal.getThreadEmpName()); + baseBean.setModifyUser(BaseThreadLocal.getThreadEmpName()); + } + } + //组织代码 + if (StringUtils.isBlank(baseBean.getOrganizeCode())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadOrganizeCode())) { + baseBean.setOrganizeCode(BaseThreadLocal.getThreadOrganizeCode()); + } + } + // 创建时间 + if (StringUtils.isBlank(baseBean.getCreateDatetime())){ + baseBean.setCreateDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())); + baseBean.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())); + } + //有效性 + if(baseBean.getIsValid() == null || + (baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.VAILD.getValue() && baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.INVAILD.getValue())){ + baseBean.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); //有效 + } + //是否删除 + if(baseBean.getIsDeleted() == null || + (baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue())){ + baseBean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); //未删除 + } + } + + //实体对象保存之后 + /*@PostPersist + public void afterPersist(){ + }*/ + + //实体对象修改之前 + @PreUpdate + public void preUpdate(BaseBean baseBean) { + // 修改用户 + if (StringUtils.isBlank(baseBean.getModifyUser())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadEmpName())) { + baseBean.setModifyUser(BaseThreadLocal.getThreadEmpName()); + } + } + + // 修改时间 + if (StringUtils.isEmpty(baseBean.getModifyDatetime())){ + baseBean.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())); + } + + //组织代码 + if (StringUtils.isBlank(baseBean.getOrganizeCode())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadOrganizeCode())) { + baseBean.setOrganizeCode(BaseThreadLocal.getThreadOrganizeCode()); + } + } + //有效性 + if(baseBean.getIsValid() == null || + (baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.VAILD.getValue() && baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.INVAILD.getValue())){ + baseBean.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); //有效 + } + //是否删除 + if(baseBean.getIsDeleted() == null || + (baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue())){ + baseBean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); //未删除 + } + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java new file mode 100644 index 0000000..7f7d708 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java @@ -0,0 +1,142 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; + +/** + * @Description : 本地线程，用于保存用户临时数据（按线程生命周期保存） + * 需要在线程结束的地方调用removeThreadLocal（），防止内存泄漏 + * @Reference : 生命周期：一次controller请求 + * @Author : alwaysfrin + * @CreateDate : 2020-08-24 20:49 + * @Modify: + **/ +public class BaseThreadLocal { + public static final Logger LOGGER = LoggerFactory.getLogger(BaseThreadLocal.class); + + /*private static final ThreadLocal> dataThredLocal = new ThreadLocal(){ + @Override + protected HashMap initialValue() { + //每个线程初始化map + return new HashMap(); + } + };*/ + private static final ThreadLocal> dataThredLocal = ThreadLocal.withInitial(() -> new HashMap<>()); + + public static Object getData(String key) { + if(dataThredLocal.get() != null) { + return dataThredLocal.get().get(key); + }else{ + return null; + } + } + + public static String getDataStr(String key) { + Object data = getData(key); + if(data != null){ + return data.toString(); + }else{ + return null; + } + } + + public static int getDataInt(String key) { + Object data = getData(key); + if(data != null){ + return Integer.parseInt(data.toString()); + }else{ + return 0; + } + } + + public static long getDataLong(String key) { + Object data = getData(key); + if(data != null){ + return Long.parseLong(data.toString()); + }else{ + return 0L; + } + } + + public static double getDataDouble(String key) { + Object data = getData(key); + if(data != null){ + return Double.parseDouble(data.toString()); + }else{ + return 0.0; + } + } + + public static void setData(String name, Object value) { + //不需要主数据源开始，则自动切换 + dataThredLocal.get().put(name, value); + } + + /** + * 手动再次清除线程变量 + * 需要在方法后调用，或者通过ascept拦截后进行清空 + */ + public static void removeThreadLocal(){ + if(dataThredLocal != null) { + if (dataThredLocal.get() != null) { + //清空数据 + dataThredLocal.get().clear(); + } + //移除当前线程信息 + dataThredLocal.remove(); + } + } + + public static String getInfo(){ + Thread thread = Thread.currentThread(); + return "thead-id:" + thread.getId() + ",thread:" + thread; + } + + public static void printDetail(){ + LOGGER.info("========本地线程临时数据======="); + LOGGER.info("数据数量：{}", dataThredLocal.get().size()); + for(String key : dataThredLocal.get().keySet()){ + LOGGER.info("key:{},value:{}",key,dataThredLocal.get().get(key)); + } + } + + /********* 用户信息 **********/ + public static final String INIT_INFO = "INIT_INFO"; //初始化数据 + public static final String EMP_NAME = "USER_NAME"; //用户名 + public static final String ORGANIZE_CODE = "ORGANIZE_CODE"; //组织代码 + + public static boolean isInit(){ + Object data = getData(INIT_INFO); + if(data != null){ + return Boolean.parseBoolean(data.toString()); + }else{ + return false; + } + } + + //初始化用户数据 + public static void initSessionUserThreadLocal(String empName, String organizeCode){ + setData(BaseThreadLocal.EMP_NAME, empName); + setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode); + setData(BaseThreadLocal.INIT_INFO, true); + } + + //获取线程中的人员姓名 + public static String getThreadEmpName(){ + String empName = getDataStr(EMP_NAME); + if(empName == null){ + empName = "系统"; + } + return empName; + } + //获取线程中的组织代码 + public static String getThreadOrganizeCode(){ + String organizeCode = getDataStr(ORGANIZE_CODE); + if(organizeCode == null){ + organizeCode = "-1"; + } + return organizeCode; + } +} From b2517a11b8e31771a6e3c1d457ea47de60bbc90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 1 Sep 2020 22:08:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97):=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=8F=8A=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 3 +++ .../i3plus/pojo/platform/bean/SysLogUserLogin.java | 25 +++++++++++++--------- .../i3plus/pojo/platform/bean/SysUserInfo.java | 3 ++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 13 +++++++++++ 4 files changed, 33 insertions(+), 11 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 5e6fc6d..b53822b 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 @@ -1047,6 +1047,9 @@ public class CommonEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { + return valueOf(val); + } public static int descOf(String desc) { int tmp = -1; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index f1a39bf..e0d0faa 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -25,36 +27,39 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="SYS_LOG_USER_LOGIN") -@Api(value="用户登录记录",description = "用户登录记录") +@ApiModel(value="用户登录记录",description = "用户登录记录") public class SysLogUserLogin extends BaseBean { private static final long serialVersionUID = 4665598896654312569L; @Column(name="USER_ID") - @ApiParam(value ="用户ID" , access ="用户ID") + @ApiModelProperty(value ="用户ID" , access ="用户ID") + @AnnoOutputColumn(hidden = true) private Long userId; @Column(name="LOG_LOGIN_NAME") - @ApiParam(value ="登录名称" , access ="登录名称") + @ApiModelProperty(value ="登录名称" , access ="登录名称") private String logLoginName; @Column(name="LOG_LOGIN_STATUS") - @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1") + @ApiModelProperty(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_LOGIN_STATUS.class) private Integer logLoginStatus; @Column(name="LOG_LOGIN_PLATFORM") - @ApiParam(value ="登录平台ID（枚举）" , example ="1") + @ApiModelProperty(value ="登录平台ID（枚举）" , example ="1") + @AnnoOutputColumn(hidden = true) private Integer logLoginPlatform; @Column(name="LOG_LOGIN_HOST") - @ApiParam(value ="登录IP" , access ="登录IP") + @ApiModelProperty(value ="登录IP" , access ="登录IP") private String logLoginHost; @Column(name="LOG_LOGIN_BROWSER") - @ApiParam(value ="登录浏览器" , access ="登录的浏览器") + @ApiModelProperty(value ="登录浏览器" , access ="登录的浏览器") private String logLoginBrowser; @Column(name="LOG_LOGIN_DATE_TIME") - @ApiParam(value ="登录时间" , access ="登录时间") + @ApiModelProperty(value ="登录时间" , access ="登录时间") private String logLoginDateTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index fded310..a11bded 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -140,7 +141,7 @@ public class SysUserInfo extends BaseBean { @Column(name="USER_INFO_STATUS") @ApiParam(value ="用户状态" , example ="-1") - @AnnoOutputColumn(hidden = true) + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userInfoStatus; @Column(name="USER_LOGIN_NUM") 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 0da42ea..62bc977 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 @@ -1169,4 +1169,17 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin); + + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(),"logLoginStatus",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(),"logLoginPlatform",ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(),"logLoginName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean); + DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true); + + return ddlPackBean; + } + } \ No newline at end of file From 6c351c09b512c1ad8855d7e5c179191e095c7bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 3 Sep 2020 20:35:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=9011016=2019048-=20=E6=80=BB?= =?UTF-8?q?=E8=A3=85=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=EF=BC=81-2020-09-03=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 93 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPackageTrans.java | 73 +++++++++++++++++ .../mes/repository/MesPackageTransRepository.java | 14 ++++ 3 files changed, 180 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 7b5637d..f74c24f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4999,4 +4999,97 @@ public class MesPcnEnumUtil { } } + /** + * 事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_STATUS { + + CREATE(10, "创建"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + PACKAGE_TRANS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java new file mode 100644 index 0000000..230f503 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :MES_出入库事务信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_TRANS") +@Api("MES_出入库事务") +public class MesPackageTrans extends BaseBean implements Serializable { + private static final long serialVersionUID = -89611828516676432L; + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "TRANS_TYPE") + @ApiParam("事务类型") + private Integer transType = 10; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status = 10; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java new file mode 100644 index 0000000..7dc91b4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackageTrans; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface MesPackageTransRepository extends BaseRepository { +} From d7133b24f56211f852a2c223f7d3b36c99790614 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 3 Sep 2020 21:22:31 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index f965f02..0e7bb95 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -167,6 +167,10 @@ public class WmsPoSn extends BaseBean { @ApiParam("汇总数量") private Double sumQty; + @Transient + @ApiParam("库位零件") + private String partLocateNo; + public WmsPoSn(){} From cf2bf8d291772a89d10a1b2cfc556bcab447546d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 3 Sep 2020 21:36:08 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseThreadLocal.java | 22 ++--- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 99 +++++++++++++++++++++- .../i3plus/pojo/platform/bean/SysMessage.java | 3 +- .../i3plus/pojo/platform/bean/SysPojoVersion.java | 10 +++ .../pojo/platform/bean/SysPojoVersionDetail.java | 15 ++++ .../pojo/platform/bean/SysRefUserExternal.java | 49 +++++++++++ .../pojo/platform/bean/SysRefUserMessage.java | 6 ++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 6 +- .../repository/SysRefUserExternalRepository.java | 14 +++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 28 ++++++ 10 files changed, 237 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java index 7f7d708..0a4d24b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java @@ -23,11 +23,11 @@ public class BaseThreadLocal { return new HashMap(); } };*/ - private static final ThreadLocal> dataThredLocal = ThreadLocal.withInitial(() -> new HashMap<>()); + private static final ThreadLocal> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>()); public static Object getData(String key) { - if(dataThredLocal.get() != null) { - return dataThredLocal.get().get(key); + if(DATA_THREAD_LOCAL.get() != null) { + return DATA_THREAD_LOCAL.get().get(key); }else{ return null; } @@ -71,7 +71,7 @@ public class BaseThreadLocal { public static void setData(String name, Object value) { //不需要主数据源开始，则自动切换 - dataThredLocal.get().put(name, value); + DATA_THREAD_LOCAL.get().put(name, value); } /** @@ -79,13 +79,13 @@ public class BaseThreadLocal { * 需要在方法后调用，或者通过ascept拦截后进行清空 */ public static void removeThreadLocal(){ - if(dataThredLocal != null) { - if (dataThredLocal.get() != null) { + if(DATA_THREAD_LOCAL != null) { + if (DATA_THREAD_LOCAL.get() != null) { //清空数据 - dataThredLocal.get().clear(); + DATA_THREAD_LOCAL.get().clear(); } //移除当前线程信息 - dataThredLocal.remove(); + DATA_THREAD_LOCAL.remove(); } } @@ -96,9 +96,9 @@ public class BaseThreadLocal { public static void printDetail(){ LOGGER.info("========本地线程临时数据======="); - LOGGER.info("数据数量：{}", dataThredLocal.get().size()); - for(String key : dataThredLocal.get().keySet()){ - LOGGER.info("key:{},value:{}",key,dataThredLocal.get().get(key)); + LOGGER.info("数据数量：{}", DATA_THREAD_LOCAL.get().size()); + for(String key : DATA_THREAD_LOCAL.get().keySet()){ + LOGGER.info("key:{},value:{}",key, DATA_THREAD_LOCAL.get().get(key)); } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 699ccde..c18a856 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -483,7 +483,8 @@ public class ImppEnumUtil { MAIL(1, "邮件", "邮件"), LETTER(2, "站内信", "站内信"), SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), - SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"), + WORK_WECHAT_TASK_CARD(5, "企业微信任务卡片", "企业微信任务卡片"); private int value; private String name; @@ -1079,7 +1080,8 @@ public class ImppEnumUtil { CONTACT(4, "联系人"), BASIS(5, "基础"), CONFIG(6, "系统配置"), - LOG(7, "日志配置"); + LOG(7, "日志配置"), + WORK_WECHAT(8, "企业微信配置"); private int value; private String description; @@ -1376,4 +1378,97 @@ public class ImppEnumUtil { return tmp; } } + + /** + * 用户外部关系 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_EXTERNAL_REF { + WORK_WECHAT(10, "企业微信"); + + private int value; + private String description; + + USER_EXTERNAL_REF(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 用户绑定属性 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_BIND_PROPERTY{ + USER_LOGIN_NAME("userId", "登录名称"), + USER_NAME("userName", "用户名称"), + EMAIL("email", "邮箱"), + USER_PHONE("phone", "手机号"), + USER_EMP_NO("empNo", "工号"), + USER_WECHAT_NO("userWeChatNo", "微信号"); + + private String value; + private String description; + + private USER_BIND_PROPERTY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static USER_BIND_PROPERTY valueOfEnum(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i]; + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index e41ee5c..394088d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -42,7 +42,8 @@ public class SysMessage extends BaseBean { private Integer messageSoftType; @Column(name = "MESSAGE_TYPE") - @ApiParam(value = "消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1") + @ApiParam(value = "消息类型(枚举：)", example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE.class) private Integer messageType; public int getMessageTypeValue() { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java index 8c7a6cb..14f0a1d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.Map; /** * @Description : @@ -81,6 +82,11 @@ public class SysPojoVersion extends BaseBean { @ApiParam(value ="记录对象对比差异") private String pojoCompare; + @Lob + @Column(name="POJO_COMPARE_TXT") + @ApiParam(value ="记录对象对比差异") + private String pojoCompareTxt; + @Transient @ApiParam(value ="用户部门信息") private SysPojoVersionDetail versionDetail; @@ -88,4 +94,8 @@ public class SysPojoVersion extends BaseBean { @Transient @ApiParam(value ="操作对象本身") private String bean; + + @Transient + @ApiParam(value ="操作对象属性描述") + private Map pojoPropDesc; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java index 9831c18..4c305e4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -44,12 +44,27 @@ public class SysPojoVersionDetail extends BaseBean { private String pojoBefore; @Lob + @Column(name="POJO_BEFORE_TXT",length = 5000) + @ApiParam(value ="原始对象信息转换后") + private String pojoBeforeTxt; + + @Lob @Column(name="POJO_AFTER",length = 5000) @ApiParam(value ="修改之后对象信息") private String pojoAfter; @Lob + @Column(name="POJO_AFTER_TXT",length = 5000) + @ApiParam(value ="修改之后对象信息转换后") + private String pojoAfterTxt; + + @Lob @Column(name="POJO_COMPARE",length = 5000) @ApiParam(value ="记录对象对比差异") private String pojoCompare; + + @Lob + @Column(name="POJO_COMPARE_TXT",length = 5000) + @ApiParam(value ="记录对象对比差异") + private String pojoCompareTxt; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java new file mode 100644 index 0000000..df659b6 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 用户外部关系 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-03 13:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_REF_USER_EXTERNAL") +@Api(value="用户外部关系",description = "用户外部关系") +public class SysRefUserExternal extends BaseBean { + + @Column(name="USER_ID") + @ApiParam(value ="用户id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="EXTERNAL_REF") + @ApiParam(value ="对象id" ,example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.USER_EXTERNAL_REF.class) + private Integer externalRef; + + @Column(name="REF_VALUE") + @ApiParam(value ="对象id" ,example = "-1") + private String refValue; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 6caccdc..5acecdd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -72,6 +73,7 @@ public class SysRefUserMessage extends BaseBean { @Column(name="MESSAGE_STATUS") @ApiParam(value = "消息状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_STATUS.class) private Integer messageStatus; public int getMessageStatusValue() { @@ -81,4 +83,8 @@ public class SysRefUserMessage extends BaseBean { return messageStatus.intValue(); } } + + public String getMessageStatusTxt() { + return ImppEnumUtil.MESSAGE_STATUS.valueOfDescription(getMessageStatusValue()); + } } 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 643cb74..835b626 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 @@ -9,9 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -76,6 +76,10 @@ public class SysUser extends BaseBean { @ApiParam(value ="手机号" , access ="手机号") private String userPhone; + @Column(name="USER_WECHAT_NO") + @ApiParam(value ="微信号") + private String userWeChatNo; + @Column(name="USER_STATUS") @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") private Integer userStatus; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java new file mode 100644 index 0000000..d6ae840 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserExternal; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-03 13:44 + * @Modify: + **/ +public interface SysRefUserExternalRepository extends BaseRepository { +} 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 62bc977..a92c56f 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 @@ -846,6 +846,7 @@ public class CoreHqlPack { public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) { StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageId(), "messageId", result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(), "messageTypeRdd", result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(), "messageSoftType", result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(), "messageTitleRdd", result); @@ -1182,4 +1183,31 @@ public class CoreHqlPack { return ddlPackBean; } + public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef,List valueList){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); + DdlPreparedPack.getInPackList(valueList,"valueList",ddlPackBean); + + return ddlPackBean; + } + public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef,List userIdList){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); + DdlPreparedPack.getInPackList(userIdList,"userId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysRefUserExternal); + + DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getExternalRef(), "externalRef", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysRefUserExternal.getRefValue(), "refValue", ddlPackBean); + + return ddlPackBean; + } + } \ No newline at end of file From 26367ea28df8bb66bb9ecd070f8f7b590e97c987 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 3 Sep 2020 21:37:12 +0800 Subject: [PATCH 6/8] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184=2006?= =?UTF-8?q?=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index bfe28bc..e26eba3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -122,6 +122,10 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "零件号") public String partNo; + @Transient + @ApiParam(value = "零件名称") + public String partNameRdd; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -137,4 +141,15 @@ public class WmsQCMaster extends BaseBean { this.refSrc = refSrc; this.partNo = partNo; } + + public WmsQCMaster(String orderNo, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.vendorNo = vendorNo; + this.VendorDesc = VendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } } From 5fbd0fdd80f6b935c7c344825781a1b2a372e249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 3 Sep 2020 22:48:33 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysOrderNoRecord.java | 50 ++++++++++++++++++++++ .../repository/SysOrderNoRecordRepository.java | 14 ++++++ 2 files changed, 64 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java new file mode 100644 index 0000000..6bcbff7 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 单号规则记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 15:12 + * @Modify: Dev 2018-12-12 09:41:07 + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_ORDER_NO_RECORD") +@ApiModel(value = "单号记录", description = "单号记录") +public class SysOrderNoRecord extends BaseBean { + + private static final long serialVersionUID = 2749057829943250024L; + + @Column(name = "RULE_CODE") + @ApiModelProperty(value = "规则代码") + private String ruleCode; + + @Column(name = "ORDER_NO") + @ApiModelProperty(value = "单号") + private String orderNo; + + + public SysOrderNoRecord() { + } + + public SysOrderNoRecord(String ruleCode,String orderNo) { + this.ruleCode = ruleCode; + this.orderNo = orderNo; + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java new file mode 100644 index 0000000..146591d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRecord; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-03 22:01 + * @Modify: + **/ +public interface SysOrderNoRecordRepository extends BaseRepository { +} From bd8cc364c111997ef3aa52a3f8ce92ea13aa547c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 4 Sep 2020 09:24:02 +0800 Subject: [PATCH 8/8] =?UTF-8?q?jsp=E8=AE=A1=E7=AE=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 3 ++- .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ .../i3plus/pojo/mes/bean/MesQueueGroupCount.java | 4 ++++ .../i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 19 ++++++++++++++++++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 21177f7..20826ec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -413,8 +413,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { * @param workCenterNameRdd * @param andonCount */ - public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) { + public AndonManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) { this.organizeNameRdd = organizeNameRdd; + this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.andonCount = andonCount; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 7ad424d..c695604 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -71,6 +71,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + @Transient @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index 1c1795f..cc47d6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -51,4 +51,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable { @Column(name = "GROUP_SIDE") @ApiParam("料架摆放位置") private String groupSide; + + @Transient + @ApiParam("分组序号") + private String groupSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 1d1c468..742a516 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -25,7 +25,6 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@NoArgsConstructor @AllArgsConstructor @Builder @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") @@ -100,4 +99,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Transient @ApiParam("工单类型") private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + public MesQueueJitActualDetail() { + + } + + public MesQueueJitActualDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } }