From c16497223854f92b81d54677268548596d26daf7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 24 May 2019 18:24:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E8=AE=A2=E5=8D=95=EF=BC=8C=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=93=E5=8D=B0=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java | 5 +++++ .../i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 6143e86..f9132ff 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -53,4 +54,8 @@ public class SwebProcurementPlanOrderDetails extends BaseBean { @ApiParam(value = "行项目状态", example = "1") @Column(name = "ITEM_STATUS") private Integer itemStatus; + + @Transient + @ApiParam(value ="采购单位") + private String buyUnit; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java index 954bda9..5294bcf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java @@ -100,4 +100,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable { @ApiParam(value = "交货时间") private String deliveryTime; + + @ApiParam(value = "单位") + private String unit; } From 92335a3db0ec6ab1ad53824bede7f871846619b5 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 27 May 2019 11:44:55 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8F=91=E5=B8=83=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/platform/bean/SysRole.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 4ded623..af3fb1d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -44,32 +44,14 @@ public class SysRole extends BaseBean { @ApiParam(value ="角色等级（待定）" , example ="-1") private Integer roleGrade; - @Column(name="PARENT_ID") - @ApiParam(value ="角色父节点ID" , example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - @Column(name="PARENT_NAME_RDD") - @ApiParam(value ="角色父节点名称" , access ="角色父节点名称") - private String parentNameRdd; - @Column(name="MODULE_NUMBER") @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量") private Integer moduleNumber; - @Column(name="MODULE_NAMES_RDD") - @ApiParam(value ="权限模块名称" , access ="权限模块名称") - private String moduleNamesRdd; - @Column(name="MENU_NUMBER_RDD") @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") private Integer menuNumber; - @Lob - @Column(name="MENU_NAMES_RDD") - @ApiParam(value ="权限功能名称" , access ="权限功能名称") - private String menuNamesRdd; - @Column(name="ROLE_STATUS") @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") private Integer roleStatus; From f6acf45ace157e8661a75583ec2868920d1892dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 27 May 2019 15:12:22 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B9=90=E8=A7=82=E9=94=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 9 +++++---- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 ++++- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 5 +++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 +++++++++++++++++++- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 0acbebb..de27d02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -10,10 +10,7 @@ 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.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; /** @@ -122,4 +119,8 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam(value = "已收数量", example = "0") public Double recQty; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public int lockVersion; } 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 2108003..45df2ab 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 @@ -194,5 +194,8 @@ public class WmsDocMovementDetails extends BaseBean { public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); } - + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public int lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 8e8a2b3..5edb358 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -132,4 +132,9 @@ public class WmsPOMasterDetails extends BaseBean { public Boolean isDateCodeEdit = true; public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public int lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index b7dd03a..4930cd7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -13,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; /** * @Description : 质检单明细信息 @@ -80,4 +80,9 @@ public class WmsQCDetails extends BaseBean { @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public int lockVersion; } 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 0f3f1e6..a45d999 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 @@ -1349,6 +1349,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); + DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); String data = String.join(",", roleIds); DdlPreparedPack.getInPack(data, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); @@ -1397,7 +1398,6 @@ public class WmsHqlPack { } } } - // 通用数据拼接 getStringBuilderPack(new WmsDataAuth(), result); return result; @@ -1619,4 +1619,22 @@ public class WmsHqlPack { return result; } + + /** + * 组件 历史记录查询 + * + * @param wmsMoveSn + * @return + */ + public static DdlPackBean packHqlWmsHistorical(WmsMoveSn wmsMoveSn) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(wmsMoveSn.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(wmsMoveSn.getIsDeleted(), "isDeleted", result); + + return result; + } } From 022795e344b2d6d827c64082aecfb5fd8a4cdada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 27 May 2019 15:43:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?ANDON=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 1e8371e..5f2309c 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 @@ -283,7 +283,9 @@ public class AndonManageQueue extends BaseBean { /** * 原因统计 使用Java内存计算（获取原始数据） * @param workCenterCode + * @param workCenterNameRdd * @param workCellCode + * @param workCellNameRdd * @param alarmCode * @param ecCode * @param ecNameRdd @@ -293,9 +295,11 @@ public class AndonManageQueue extends BaseBean { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String workCenterCode,String workCellCode,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; this.workCellCode = workCellCode; + this.workCellNameRdd = workCellNameRdd; this.alarmCode = alarmCode; this.ecCode = ecCode; this.ecNameRdd = ecNameRdd; From 37dc68b858d21e2e81719ec170e5d6f75a009f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 27 May 2019 15:51:37 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9hql=E8=AF=AD=E5=8F=A5?= 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, 2 insertions(+), 2 deletions(-) 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 a45d999..02f9b9f 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 @@ -1350,8 +1350,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); - String data = String.join(",", roleIds); - DdlPreparedPack.getInPack(data, "roleCode", result); +// String data = String.join(",", roleIds); + DdlPreparedPack.getInPackList(roleIds, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); return result; } From c9f16c701f37b7918589a6bef881a30e73b924c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 27 May 2019 16:41:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?ANDON=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 9 +++++++-- 1 file changed, 7 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 5f2309c..0d568d9 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 @@ -271,11 +271,15 @@ public class AndonManageQueue extends BaseBean { * @param alarmCode * @param andonCount */ - public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) { + public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, String alarmCode, Long andonCount) { this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; this.workCellCode = workCellCode; this.equipmentCode = equipmentCode; + this.equipmentNameRdd = equipmentNameRdd; this.shiftCode = shiftCode; + this.shiftNameRdd = shiftNameRdd; this.alarmCode = alarmCode; this.andonCount = andonCount; } @@ -335,7 +339,8 @@ public class AndonManageQueue extends BaseBean { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){ + public AndonManageQueue(String workCenterNameRdd,String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){ + this.workCenterNameRdd = workCenterNameRdd; this.ecNameRdd = ecNameRdd; this.ecCode = ecCode; this.alarmCode = alarmCode; From 507c3590676a06bce2fbbd4fe4b867191b8678ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 27 May 2019 15:28:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20websocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java | 3 +++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java index 6581078..d5ffa91 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java @@ -13,6 +13,9 @@ import lombok.Data; @Data public class MailConfig { + @ApiParam(value = "邮箱开关") + private int mailSwitch; + @ApiParam(value = "邮箱服务器") private String mailHost; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 75819f7..5361cd0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -50,6 +50,14 @@ public class SysDictionary extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + public long getParentIdVal(){ + if(parentId == null){ + return 0; + } else { + return parentId.longValue(); + } + } + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级节点名称") private String parentNameRdd;