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] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=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; + } }