Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1584,6 +1584,42 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 打印单号数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_ORDER_TYPE {
+        PO(10, "PO"),
+        MOVEMENT(20, "MOVEMENT"),
+        ASN(30, "ASN");
+
+        private int value;
+        private String description;
+
+        PRINT_ORDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 组件统一返回提示
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 订单打印数据封装model
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-18 11:50
+ * @Modify:
+ **/
+@Data
+public class PrintOrderDataModel {
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+
+    @ApiParam(value = "单号")
+    public String orderNo;
+
+    @ApiParam(value = "业务类型", example = "-1")
+    public Integer busiType;
+
+    @ApiParam(value = "状态", example = "-1")
+    public Integer status;
+
+    @ApiParam(value = "打印标志", example = "-1")
+    public Integer printFlag;
+
+    @ApiParam(value = "供应商编号")
+    public String vendorNo;
+
+    @ApiParam(value = "客户编号")
+    public String custNo;
+
+    @ApiParam(value = "版本")
+    public String version;
+
+    @ApiParam(value = "ERP单号")
+    public String erpSrcNo;
+
+    @ApiParam(value = "业务数据类型", example = "-1")
+    public Integer busiDataType;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -25,19 +25,19 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LABELTEMPLATE")
+@Table(name="SYS_LABEL_TEMPLATE")
 @Api(value="打印模板",description = "打印模板")
 public class SysLabelTemplate extends BaseBean {
 
-    @Column(name="TEMPLATECODE")
+    @Column(name="TEMPLATE_CODE")
     @ApiParam(value ="模板代码")
     private String templateCode;
 
-    @Column(name="TEMPLATENAME")
+    @Column(name="TEMPLATE_NAME")
     @ApiParam(value ="模板名称")
     private String templateName;
 
-    @Column(name="TEMPLATECONTENT", columnDefinition = "TEXT")
+    @Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT")
     @ApiParam(value ="模板内容")
     private String templateContent;
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java

@@ -27,24 +27,24 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LABELTEMPLATEPARAM")
+@Table(name="SYS_LABEL_TEMPLATE_PARAM")
 @Api(value="打印模板参数",description = "打印模板参数")
 public class SysLabelTemplateParam extends BaseBean {
 
-    @Column(name="TEMPLATEID")
+    @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long templateId;
 
-    @Column(name="TEMPLATECODE")
+    @Column(name="TEMPLATE_CODE")
     @ApiParam(value ="模板代码")
     private String templateCode;
 
-    @Column(name="TEMPLATEPARAM")
+    @Column(name="TEMPLATE_PARAM")
     @ApiParam(value ="模板参数")
     private String templateParam;
 
-    @Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT")
+    @Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT")
     @ApiParam(value ="模板参数描述")
     private String templateParamText;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java

@@ -75,14 +75,4 @@ public class WmsQCDetails extends BaseBean {
     @Column(name = "REJECT_QTY")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;
-
-    @Column(name = "QC_USER")
-    @ApiParam("检验员")
-    public String qcUser;
-
-    @Column(name = "QC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
-    public String qcTime;
-
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java

@@ -1,6 +1,7 @@
 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;
@@ -70,4 +71,13 @@ public class WmsQCTrans extends BaseBean {
     @Column(name="SN")
     @ApiParam("条码")
     public String sn;
+
+    @Column(name = "QC_USER")
+    @ApiParam("检验员")
+    public String qcUser;
+
+    @Column(name = "QC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
+    public String qcTime;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -782,7 +782,11 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
         HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
-
+        HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
         getStringBuilderPack(wmsStockSn, result);
 
         return result.toString();