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/WmsPOMasterDetails.java

@@ -34,8 +34,9 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name = "BOX_QTY")
+    @Column(name = "BOX_QTY" )
-    @ApiParam("箱数")
+    @ColumnDefault("0")
+    @ApiParam(value ="箱数", example = "0")
     public Integer boxQty;
 
     @Column(name = "PART_NAME_RDD")

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

@@ -102,6 +102,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 
+    @Column(name = "SCRAP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "报废数量", example = "0")
+    private Double scrapQty;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
@@ -134,10 +139,14 @@ public class WmsStockQuan extends BaseBean {
         return this.lockQty == null ? 0 : this.lockQty;
     }
 
+    public Double getScrapQty() {
+        return this.scrapQty == null ? 0 : this.scrapQty;
+    }
+
     public WmsStockQuan() {
     }
 
-    public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) {
+    public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
         this.failQty = failQty;
         this.holdQty = holdQty;
@@ -146,5 +155,6 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
     }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java

@@ -28,6 +28,11 @@ public class MappingItem {
      */
     public String destName;
     /**
+     * 该字段在目标表是不是主键
+     * 1=主键
+     */
+    public Integer destPk;
+    /**
      * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确
      * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone)
      */
@@ -39,6 +44,7 @@ public class MappingItem {
                 + this.srcName + ", destBeanName:"
                 + this.destBeanName + ", destName"
                 + this.destName + ", defaultValue:"
-                + this.defaultValue;
+                + this.defaultValue + ", destPk:"
+                + this.destPk;
     }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -89,4 +89,11 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "DEST_COLUMN_MAPPING", length = 5000)
     public String destColumnMapping;
+
+    /**
+     * 接口分组名称
+     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS
+     */
+    @Column(name = "GROUP_NAME")
+    public String groupName;
 }

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

@@ -1687,6 +1687,18 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsLineLocatePart, result);
         return result;
     }
+    /**
+     * 任务数据来源 分页查询
+     *
+     * @param wmsTaskSrc
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
+        DdlPackBean result = new DdlPackBean();
 
-
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
+        getStringBuilderPack(wmsTaskSrc, result);
+        return result;
+    }
 }