diff --git a/.gitignore b/.gitignore
index 838e520..586e79f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,12 @@
### Example user template
# IntelliJ project files .gitignore
-.idea
-*.iml
out
gen
target
+.idea
+.iml
.jar
.class
-.md
\ No newline at end of file
+.md
+.log
diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml
new file mode 100644
index 0000000..ec94526
--- /dev/null
+++ b/i3plus-pojo.iml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml
new file mode 100644
index 0000000..5dd064c
--- /dev/null
+++ b/modules/i3plus-pojo-base/i3plus-pojo-base.iml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 5baff68..2d479ab 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
@@ -1589,8 +1589,8 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_ORDER_TYPE {
PO(10, "PO"),
- MOVEMENT(20, "MOVEMENT"),
- ASN(30, "ASN");
+ ASN(30, "ASN"),
+ MOVEMENT(20, "MOVEMENT");
private int value;
private String description;
diff --git a/modules/i3plus-pojo-form/i3plus-pojo-form.iml b/modules/i3plus-pojo-form/i3plus-pojo-form.iml
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-form/i3plus-pojo-form.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
index bba2a17..788fd21 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
@@ -2,10 +2,6 @@ package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.sun.xml.internal.bind.v2.model.core.ID;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
index 942a339..cfc903f 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.sun.xml.internal.bind.v2.model.core.ID;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -16,8 +15,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
-import javax.transaction.Transactional;
-import java.util.List;
/**
* @Description :
diff --git a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml
new file mode 100644
index 0000000..d75c4ad
--- /dev/null
+++ b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml
new file mode 100644
index 0000000..d75c4ad
--- /dev/null
+++ b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml
new file mode 100644
index 0000000..c1a72f3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml
new file mode 100644
index 0000000..97807fd
--- /dev/null
+++ b/modules/i3plus-pojo-model/i3plus-pojo-model.iml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml
new file mode 100644
index 0000000..c1a72f3
--- /dev/null
+++ b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-report/i3plus-pojo-report.iml b/modules/i3plus-pojo-report/i3plus-pojo-report.iml
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-report/i3plus-pojo-report.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml
new file mode 100644
index 0000000..c1a72f3
--- /dev/null
+++ b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java
new file mode 100644
index 0000000..d2fa686
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java
@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.pojo.wms.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 org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.Date;
+
+/**
+ * @Description : 条码补打印记录表
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-21 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_SN_PRINT_RCD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "条码补打印记录表", description = "条码补打印记录表")
+public class WmsSnPrintRcd extends BaseBean {
+
+ @Column(name = "WH_NO")
+ @ApiParam(value = "仓库代码")
+ private String whNo;
+
+ @Column(name = "ZONE_NO")
+ @ApiParam(value = "存储区编号")
+ private String zoneNo;
+
+ @Column(name = "LOCATE_NO")
+ @ApiParam(value = "库位代码")
+ private String locateNo;
+
+ @Column(name = "PART_NO")
+ @ApiParam(value = "物料编号")
+ private String partNo;
+
+ @Column(name = "PART_NAME_RDD")
+ @ApiParam(value = "物料名称")
+ private String partNameRdd;
+
+ @Column(name = "SN")
+ @ApiParam(value = "条码")
+ private String sn;
+
+ @Column(name = "UNIT")
+ @ApiParam(value = "单位")
+ private String unit;
+
+ @Column(name = "QTY")
+ @ApiParam(value = "数量", example = "0")
+ private Double qty;
+
+ @Column(name = "PDATE")
+ @ApiParam(value = "打印时间")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date pdate;
+
+ @ApiParam(value = "仓库名称")
+ @Transient
+ public String whNameRdd;
+
+ @ApiParam(value = "存储区名称")
+ @Transient
+ public String zoneNameRdd;
+
+ @ApiParam(value = "库位名称")
+ @Transient
+ public String locateNameRdd;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java
new file mode 100644
index 0000000..d4a0c0a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :条码打印记录Repository的方法接口
+* @Reference :
+* @Author : siliter
+* @CreateDate : 2019-03-21 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsSnPrintRcdRepository extends BaseRepository {
+}
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 dac5fb6..7276557 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
@@ -269,6 +269,20 @@ public class WmsHqlPack {
}
/**
+ * 根据类型查询库位分页
+ *
+ * @param wmsLocate
+ * @return
+ */
+ public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) {
+ StringBuffer result = new StringBuffer();
+ //查询参数封装
+ HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
+ getStringBuilderPack(wmsLocate, result);
+ return result.toString();
+ }
+
+ /**
* 交易类型信息 分页查询
*
* @param wmsTransType
@@ -1248,6 +1262,12 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result);
// 单据编号
HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result);
+ // 设备编号
+ HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result);
+ // 交易类型代码
+ HqlPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result);
+ // 流程状态
+ HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result);
getStringBuilderPack(wmsActionLog, result);
@@ -1320,11 +1340,11 @@ public class WmsHqlPack {
public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
- HqlPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
- HqlPack.getNumEqualPack(wmsStockSn.getWhNo(), "whNo", result);
- HqlPack.getNumEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
- HqlPack.getNumEqualPack(wmsStockSn.getPartNo(), "partNo", result);
- HqlPack.getNumEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+ HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
+ HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+ HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+ HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
+ HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
@@ -1334,6 +1354,23 @@ public class WmsHqlPack {
}
/**
+ * 根据条件查询条码条码信息
+ *
+ * @param wmsSnPrintRcd
+ * @return
+ */
+ public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
+ StringBuffer result = new StringBuffer();
+ HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
+ HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
+ HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
+ HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
+ HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result);
+ getStringBuilderPack(wmsSnPrintRcd, result);
+ return result.toString();
+ }
+
+ /**
* 根据条件模糊查询库存条码信息
*
* @param wmsStockSn
@@ -1419,10 +1456,11 @@ public class WmsHqlPack {
* @param vals
* @return
*/
- public static String packHqlAndIn(BaseBean bean, String columnName, List vals) {
+ public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) {
StringBuffer result = new StringBuffer();
String data = String.join(",", vals);
- HqlPack.getInPackString(data, columnName, result);
+ HqlPack.getInPackString(data,columnName,result);
+ HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result);
getStringBuilderPack(bean, result);
return result.toString();
}
diff --git a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml
new file mode 100644
index 0000000..d75c4ad
--- /dev/null
+++ b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file