diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index ebd53c3..f8fa98e 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 4fa7c5a..1414885 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index e97c0bb..d790ef1 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 90e744d..c6141da 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 0ba3645..23e5bee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 6706323..c1e2cb9 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index ffcac19..856da5f 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index e388a1d..09f2c4a 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 62ebe64..82fdbe8 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 39d9423..b7b2dfc 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index e310bfd..ec9e100 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 92de049..0db7b7d 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
index bbb4564..9a1598e 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.ptl.bean.*;
import org.springframework.util.StringUtils;
@@ -228,10 +227,10 @@ public class PtlHqlPack {
public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
- DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result);
- DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result);
- if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart())
- && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) {
+ DdlPreparedPack.getStringLikerPack(ptlAreaTask.getTaskNo(), "taskNo", result);
+ DdlPreparedPack.getStringLikerPack(ptlAreaTask.getPartNo(), "partNo", result);
+ if (!StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeStart())
+ || !StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
, "createDatetime", result, true);
}
@@ -253,10 +252,10 @@ public class PtlHqlPack {
public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
- DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result);
- DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result);
- if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart())
- && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) {
+ DdlPreparedPack.getStringLikerPack(ptlMainTask.getTaskNo(), "taskNo", result);
+ DdlPreparedPack.getStringLikerPack(ptlMainTask.getPartNo(), "partNo", result);
+ if (!StringUtils.isEmpty(ptlMainTask.getCreateDateTimeStart())
+ || !StringUtils.isEmpty(ptlMainTask.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd()
, "createDatetime", result, true);
}
@@ -276,15 +275,16 @@ public class PtlHqlPack {
public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
- DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
- DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
- if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart())
- && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) {
+ DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
+ DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
+ if (!StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeStart())
+ || !StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd()
, "createDatetime", result, true);
}
DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result);
DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result);
+ DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getStatus(), "status", result);
DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index e36fcf7..bd09726 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 81fb02b..4c96781 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 1f622d9..2c24e41 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index bc41914..18c811c 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
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 33453b8..8b79c72 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
@@ -311,4 +311,14 @@ public class WmsDocMovementDetails extends BaseBean {
this.orderNo = orderNo;
}
+ public WmsDocMovementDetails (String orderNo,String partNo,Double qty, Double pickQty, int itemStatus, String createDatetime, String modifyDatetime) {
+ this.orderNo = orderNo;
+ this.partNo = partNo;
+ this.qty = qty;
+ this.pickQty = pickQty;
+ this.itemStatus = itemStatus;
+ this.createDatetime = createDatetime;
+ this.modifyDatetime = modifyDatetime;
+ }
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
index 929b274..f64bf33 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
@@ -65,8 +65,10 @@ public class WmsFurniture extends BaseBean {
public WmsFurniture() {
}
- public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo,
+ public WmsFurniture(Long id,String organizeCode, String whNo, String zoneNo, String typeCode, String furnitureNo,
Integer isSaveGoods, String position, Integer storey, Integer fntCol) {
+ this.id = id;
+ this.organizeCode = organizeCode;
this.whNo = whNo;
this.zoneNo = zoneNo;
this.typeCode = typeCode;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index a5b6221..ee6babb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -178,7 +178,7 @@ public class WmsLocate extends BaseBean {
@Transient
@ApiParam(value = "移动频次")
- private Integer frequency;
+ private Long frequency;
@Transient
@ApiParam(value = "库龄")
@@ -197,7 +197,8 @@ public class WmsLocate extends BaseBean {
this.partQty=partQty;
this.locateNo=locateNo;
}
- public WmsLocate(String locateNo,Integer frequency,String organizeCode,
+ //3D仓库-库位移动频率热力图
+ public WmsLocate(String locateNo,Long frequency,String organizeCode,
String whNo,String zoneNo,String furnitureNo,
Integer x,Integer y,Integer z){
this.locateNo=locateNo;
@@ -210,6 +211,7 @@ public class WmsLocate extends BaseBean {
this.y=y;
this.z=z;
}
+ //3D仓库-库龄热力图
public WmsLocate(String locateNo,String age,String organizeCode,
String whNo,String zoneNo,String furnitureNo,
Integer x,Integer y,Integer z){
@@ -244,8 +246,8 @@ public class WmsLocate extends BaseBean {
return this.locateType== null ? 0 : this.locateType.intValue();
}
- public Integer getFrequencyVal() {
- return this.frequency == null ? 0 : this.frequency.intValue();
+ public Long getFrequencyVal() {
+ return this.frequency == null ? 0 : this.frequency.longValue();
}
public Integer getLcLengthVal() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java
index 8827222..8688652 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java
@@ -33,6 +33,7 @@ public class WmsSnOperateRecord extends BaseBean {
@Column(name = "SN")
@ApiParam(value = "条码")
+ @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String sn;
@Column(name = "LINE_CODE")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java
index d707fe8..2e3cffa 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java
@@ -54,7 +54,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
/**
* 来源表的查询条件
*/
- @Column(name = "SRC_WHERE", length = 255)
+ @Column(name = "SRC_WHERE", length = 500)
public String srcWhere;
/**
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 abff614..4ceec06 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
@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
@@ -545,7 +546,7 @@ public class WmsHqlPack {
DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result);
}
if (wmsLocate.getLocateNoArr() != null) {
- DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);
+ DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result);
}
// DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
@@ -1303,6 +1304,12 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+ if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
+ wmsStockSn.setQualityDateTimeStart("");
+ }
+ if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeEnd())) {
+ wmsStockSn.setQualityDateTimeEnd("");
+ }
DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(),
"qualityDate", result, false,false);
if (wmsStockSn.getIsValid() != null) {
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 93f9732..1171f4e 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 2ffb2ae..bca9cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform