Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -58,7 +58,7 @@ public class SapCyco extends SapBase{
 
     @ApiParam(value = "删除标识")
     @AnnoOutputColumn
-    private String xloek;
+    private String xloek="";
 
     @ApiParam(value = "年度")
     @AnnoOutputColumn

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

@@ -220,6 +220,6 @@ public class WmsDocMovementDetails extends BaseBean {
     public Integer busiType;
 
     @Column(name = "IS_SN")
-    @ApiParam(value = "条码生成状态", example = "1")
+    @ApiParam(value = "条码生成状态", example = "20")
     public Integer isSn;
 }

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

@@ -204,7 +204,7 @@ public class WmsStockQuan extends BaseBean {
     }
 
     public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
-                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) {
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName, Double scrapQty) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -220,6 +220,7 @@ public class WmsStockQuan extends BaseBean {
         this.lockQty = lockQty;
         this.prodCfgTypeCode= prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
+        this.scrapQty = scrapQty;
     }
     public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.bean.esbio;
+
+import lombok.Data;
+
+/**
+ * Created by Administrator on 2019/7/2.
+ */
+@Data
+public class IQ {
+
+    public  String SID="";
+
+    public  String TPDESC="";
+
+    public  String RECYMD="";
+
+    public  String RECHMS="";
+
+    public  String XMLCON="";
+
+    public  String ACTFLG="";
+
+    public  String ACTYMD="";
+
+    public  String ACTHMS="";
+
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.bean.esbio;
+
+import lombok.Data;
+
+/**
+ * Created by Administrator on 2019/7/2.
+ */
+@Data
+public class OQ {
+
+    public  String SID="";
+
+    public  String TPDESC="";
+
+    public  String CREYMD="";
+
+    public  String CREHMS="";
+
+    public  String XMLCON="";
+
+    public  String ACTFLG="";
+
+    public  String ACTYMD="";
+
+    public  String ACTHMS="";
+
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.wms.bean.esbio;
+
+import lombok.Data;
+
+@Data
+public class PublishTopicData {
+
+    public int TPID =0;
+
+    public  String PBNO ="";
+
+    public  String TPNO ="";
+
+    public  String TPDESC ="";
+
+    public  String MESTAB ="";
+
+    public  String MESGROP ="";
+
+    public  String MESORD ="";
+
+    public  String MESPK ="";
+
+    public  String PBNAME ="";
+
+}

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.wms.bean.esbio;
+
+import lombok.Data;
+
+@Data
+public class SI_TP {
+
+    public  String TPTYP="";
+
+    public  String TPNO="";
+
+    public  String TPDESC="";
+
+    public  String MESTAB="";
+
+    public  String MESGROP="";
+
+    public  String MESPK="";
+
+    public  String ACTTYP="";
+
+    public  String ACTDESC="";
+
+    public  String ENAB="";
+
+    public  String WERKS="";
+
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.bean.esbio;
+
+import lombok.Data;
+@Data
+public class SI_TPMAP {
+
+    public  int SEQ=0;
+
+    public  String SAPCOL="";
+
+    public  String MESCOL="";
+
+    public  String COLTYP="";
+
+    public  String COLDESC="";
+
+}