From 37aa342f466459bdccf38161c5efe170ec999a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 23 May 2019 18:46:20 +0800 Subject: [PATCH 01/10] =?UTF-8?q?MES-JIT=E9=98=9F=E5=88=97=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=89=8D=E7=AB=AF=E8=B0=83=E8=AF=95BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 2 +- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 36 +++++++++++++++------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 1aedff5..d32d1cf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -57,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private String workOrderType; + private String workType; @Column(name="PRODUCE_CATEGORY_CODE") @ApiParam("产品类型代码") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index edd6b29..11b8373 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -16,30 +17,43 @@ import java.io.Serializable; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { - @ApiParam("队列ID") - public Long queueId; - @ApiParam("队列明细ID") - public Long queueDetailId; @ApiParam("队列序号") - public Integer queueSeq; + public Double queueSeq; @ApiParam("队列明细序号") - public Integer queDetailSeq; + public Double queDetailSeq; @ApiParam("客户标识号") public String custFlagNo; @ApiParam("产品配置名称") - public String prodCfgName; + public String prodCfgNameRdd; @ApiParam("产品类型名称") - public String categoryName; + public String categoryNameRdd; @ApiParam("产品条码") public String serialNumber; @ApiParam("物料号") public String partNo; - @ApiParam("物料ID") - public Long partId; + @ApiParam("物料名称") + public String partNameRdd; @ApiParam("条码状态") public Integer snStatus; @ApiParam("生产类型") public String workType; + @Transient + @ApiParam("显示颜色") + private String color; + public QueueOrderModel() { + } - + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + } } From 4e45f813dc753200e8c9dd2792592ddcfb586706 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 23 May 2019 20:10:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?CS=5FORDER=5FSTATUS=20=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DdlPreparedPack getNotInPack getNotInPackString 方法修改 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 22 +++++++++++------- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 4 ++-- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 27 ++++++++++++++-------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a11ca7c..912baec 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 @@ -915,7 +915,7 @@ public class WmsEnumUtil { private int value; private String description; - CS_ORDER_TYPE(int value, String description) { + CS_ORDER_TYPE(int value,String description) { this.value = value; this.description = description; } @@ -944,18 +944,20 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ORDER_STATUS { - CREATE(10, "创建"), - STARTING_INVENTORY(20, "开启盘点"), - IN_INVENTORY(30, "盘点中"), - INVENTORY_FINISH(40, "盘点完成"), - THAWING(50, "已解冻"), - CLOSED(60, "已关闭"); + CREATE(10,"CREATE", "创建"), + STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"), + IN_INVENTORY(30,"IN_INVENTORY", "盘点中"), + INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"), + THAWING(50,"THAWING", "已解冻"), + CLOSED(60, "CLOSED","已关闭"); private int value; + private String code; private String description; - CS_ORDER_STATUS(int value, String description) { + CS_ORDER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -963,6 +965,10 @@ public class WmsEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index e5c6ecc..1b6d43a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -466,7 +466,7 @@ public class DdlPreparedPack { data += "'" + dataArray[i] + "',"; } } - packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); } } @@ -479,7 +479,7 @@ public class DdlPreparedPack { */ public static void getNotInPack(String data, String columnName, DdlPackBean packBean) { if (data != null && data.trim().length() > 0) { - packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); } } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 9bfe0df..bfb4cf3 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; @@ -71,17 +72,23 @@ public class SwebHqlPack { return buildHql(swebConfig, result); } - public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { - DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); + + // DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用 HqlPack + public static String getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result); + HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); + + HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result); + HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); - return buildHql(model, result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return result.toString(); } public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { From 63ddfd5a537a92b749c856efa1b2fcd5d1365151 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Fri, 24 May 2019 11:48:40 +0800 Subject: [PATCH 03/10] =?UTF-8?q?MES=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 7 +++---- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index d6ba7b6..b9a6c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.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; @@ -9,12 +10,10 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.util.Date; /** * @Description :BOM清单 @@ -71,12 +70,12 @@ public class MesBom extends BaseBean { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String effEndTime; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 06b8339..a11e846 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -663,6 +663,9 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(packSpec.getSpecName())){ DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } + if (StringUtils.isNotEmpty(packSpec.getParentSpec())){ + DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean); + } return packBean; } From 1f6eb341cd5c109492ab4c54176a60ea6c8aaae6 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 24 May 2019 15:54:01 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index f18b844..940e112 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -84,8 +84,8 @@ public class MesQueueOrder extends BaseBean { return this.status == null ? 0 : this.status; } - public double getSeq() { + public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } - + } From dac82b197776db31783d12f90c0b392fc64a6468 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 24 May 2019 15:55:02 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index 1305c16..dd3034b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -80,7 +80,7 @@ public class MesQueueOrder extends BaseBean { return this.status == null ? 0 : this.status; } - public double getSeq() { + public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } } From 8a9e347f136eeb5ef8c363a2743f9c718767461d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 24 May 2019 15:57:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 4 ++++ .../cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index d075fdf..18df792 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -186,4 +186,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Transient @ApiParam(value = "关联单号") private String refOrderNo; + + @Transient + @ApiParam(value = "条码") + private String barCode; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index bfb4cf3..f57e852 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -74,7 +74,7 @@ public class SwebHqlPack { // DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用 HqlPack - public static String getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { + public static String getPurchaseOrderDetailsWhereHqlByItemStatus(SwebPOForPubListEnterModel model) { StringBuffer result = new StringBuffer(); HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result); HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); @@ -91,6 +91,19 @@ public class SwebHqlPack { return result.toString(); } + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); + DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(model, result); + } + public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); From d3d25f0baa92337726a35854fcb16290d44596e1 Mon Sep 17 00:00:00 2001 From: jiajack Date: Fri, 24 May 2019 17:31:23 +0800 Subject: [PATCH 07/10] =?UTF-8?q?Pcn=E8=8A=82=E7=82=B9=E5=90=91Mes?= =?UTF-8?q?=E4=B8=BB=E6=9C=8D=E5=8A=A1=E6=B3=A8=E5=86=8C=E6=9C=BA=E5=88=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 27 ++++++++ .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 53 ++++++++++++++++ .../pcn/repository/MesPcnConnectLogRepository.java | 16 +++++ .../pojo/mes/pcn/repository/MesPcnRepository.java | 16 +++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPcnConnectLog.java | 53 ++++++++++++++++ .../mes/repository/MesPcnConnectLogRepository.java | 16 +++++ .../pojo/mes/repository/MesPcnRepository.java | 16 +++++ 8 files changed, 270 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnConnectLogRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 26b99b7..9eab2c7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -43,4 +43,31 @@ public class MesPcn extends BaseBean { @ApiParam("工作中心") private String workCentreCode; + @Column(name="PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name="CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name="CONNECT_COUNT") + @ApiParam("连接次数") + private Integer connectCount; + + @Column(name="IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name="CONNECT_TIME") + @ApiParam("连接时间") + private String connectTime; + + public int getConnectCountVal() { + return this.connectCount == null ? 0 : this.connectCount; + } + + public int getIsConnectVal() { + return this.isConnect == null ? 0 : this.isConnect; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java new file mode 100644 index 0000000..caaa169 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class MesPcnConnectLog extends BaseBean { + @Column(name="PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name="PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name="PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name="CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name="IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name="REMARK") + @ApiParam("备注") + private String Remark; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java new file mode 100644 index 0000000..c9e3e97 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java new file mode 100644 index 0000000..1ae09bf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java new file mode 100644 index 0000000..1f5b45c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.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; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN") +@Api("PCN节点") +public class MesPcn extends BaseBean { + @Column(name="PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name="PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name="AREA_CODE") + @ApiParam("区域") + private String areaCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCentreCode; + + @Column(name="PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name="CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name="CONNECT_COUNT") + @ApiParam("连接次数") + private Integer connectCount; + + @Column(name="IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name="CONNECT_TIME") + @ApiParam("连接时间") + private String connectTime; + + public int getConnectCountVal() { + return this.connectCount == null ? 0 : this.connectCount; + } + + public int getIsConnectVal() { + return this.isConnect == null ? 0 : this.isConnect; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java new file mode 100644 index 0000000..2342310 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -0,0 +1,53 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class MesPcnConnectLog extends BaseBean { + @Column(name="PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name="PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name="PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name="CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name="IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name="REMARK") + @ApiParam("备注") + private String Remark; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnConnectLogRepository.java new file mode 100644 index 0000000..2033fc3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnConnectLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnRepository.java new file mode 100644 index 0000000..bf4d85a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnRepository extends BaseRepository { +} From c16497223854f92b81d54677268548596d26daf7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 24 May 2019 18:24:29 +0800 Subject: [PATCH 08/10] =?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 09/10] =?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 10/10] =?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; + } }