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

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

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :盘点
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:16
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点",description = "盘点")
+public class SapCyco extends SapBase{
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private Integer zeili;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String meins;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "库存状态")
+    @AnnoOutputColumn
+    private String zstat;
+
+    @ApiParam(value = "特殊库存标识")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "项目号")
+    @AnnoOutputColumn
+    private String zxm;
+
+    @ApiParam(value = "库存帐冻结标识")
+    @AnnoOutputColumn
+    private String zdjbs;
+
+    @ApiParam(value = "删除标识")
+    @AnnoOutputColumn
+    private String xloek;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private Integer gjahr;
+
+    public Integer getZeilVal() {
+        return zeili== null ? 0 : this.zeili.intValue();
+    }
+
+    public Integer getGjahrVal() {
+        return gjahr== null ? 0 : this.gjahr.intValue();
+    }
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 盘点调差
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:27
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点调差",description = "盘点调差")
+public class SapDifo extends SapBase{
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeili;
+
+    @ApiParam(value = "调整")
+    @AnnoOutputColumn
+    private String ztzbs;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private String gjahr;
+
+}

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

@@ -202,6 +202,10 @@ public class WmsDocMovementDetails extends BaseBean {
 
     public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
 
+    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+
+    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 
 /**
  * @Description : 作业任务明细信息
@@ -137,6 +138,10 @@ public class WmsTaskDetails extends BaseBean {
         return this.qty == null ? 0 : this.qty;
     }
 
+    public String getQtyTxt(){
+        return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString();
+    }
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty;
     }

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

@@ -89,4 +89,11 @@ public class WmsZones extends BaseBean {
     @Transient
     @ApiParam(value ="子存储区列表")
     private List<WmsZones> childList;
+
+    public WmsZones(String zoneNo){
+        this.zoneNo = zoneNo;
+    }
+
+    public WmsZones(){}
+
 }

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

@@ -1998,5 +1998,23 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 根据存储区编号集合、库位类型查询库位信息
+     *
+     * @param zoneNoList
+     *@param wmsZones
+     * @param locateType
+     * @return
+     */
+    public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList , WmsZones wmsZones , Integer locateType) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(zoneNoList, "zoneNo", result);
+        DdlPreparedPack.getNumEqualPack(locateType, "locateType", result);
+        getStringBuilderPack(wmsZones, result);
+
+        return result;
+    }
 
 }