修复TJ MGN BUG

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.text.SimpleDateFormat;
@@ -649,6 +650,33 @@ public class DdlPreparedPack {
         }
     }
 
+
+    /**
+     * 多个字段列or查询
+     *
+     * @param data
+     * @param columnNames
+     * @param columnNamesKey
+     * @param packBean
+     */
+    public static void getMultOrPackString(String data, List<String> columnNames, String columnNamesKey, DdlPackBean packBean) {
+        StringBuffer sbf = new StringBuffer(" and ( ");
+        if (StringUtil.isEmpty(columnNamesKey)) {
+            columnNamesKey = "mult_column_name";
+        }
+        for (int i = 0; i < columnNames.size(); i++) {
+            String columnName = columnNames.get(i);
+            sbf.append(" model." + columnName + "=:m_" + columnNamesKey);
+            if (i == columnNames.size() - 1) {
+                continue;
+            }
+            sbf.append(" or ");
+        }
+        sbf.append(" )");
+        packBean.addColumnQuery(columnNamesKey, sbf.toString(), data);
+
+    }
+
     /**
      * 封装in String查询语句
      *

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

@@ -265,6 +265,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Transient
+    @ApiParam(value = "来源存储区/目标存储区")
+    private Integer srcOrDestZoneno;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }

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

@@ -9,7 +9,11 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -154,6 +158,12 @@ public class WmsStockQuan extends BaseBean {
     @Transient
     private Integer isSnapshot;
 
+
+    @Transient
+    @ApiParam(value = "应有数量")
+    private Double theoryQty;
+
+
     public Integer getIsSnapshot() {
         return this.isSnapshot == null ? 0 : this.isSnapshot;
     }
@@ -229,11 +239,34 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
+        this.sumQty = sumQty;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
     }
 
+    public WmsStockQuan(String organizeCode, 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, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+        this.organizeCode = organizeCode;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.unit = unit;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.sumQty = sumQty;
+        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;
         this.failQty = failQty;