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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java

@@ -125,7 +125,6 @@ public class DdlPackBean {
         if(orderByStr != null){
             sb.append(orderByStr);
         }
-        System.out.println("===" + sb.toString());
         return sb.toString();
     }
 

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

@@ -1069,7 +1069,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_ITEM_STATUS {
         NORMAL(10, "创建"),
-        CANCELLATION(20, "行取消");
+        CANCELLATION(20, "已处理");
 
         private int value;
         private String description;

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import org.apache.commons.lang3.StringUtils;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -338,8 +339,8 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPack(String data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+    public static void getInPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }
@@ -364,9 +365,9 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) {
+    public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
         if (data != null && data.length > 0) {
-            packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
+            packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
         }
     }
 
@@ -377,7 +378,7 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPackString(List<?> data, String columnName, DdlPackBean packBean) {
+    public static void getInPackList(List<?> data, String columnName, DdlPackBean packBean) {
         if (data != null && data.size() > 0) {
             packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
         }

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

@@ -103,6 +103,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "剩余数量", example = "1")
     public Double surplusQty;
 
+    @Transient
+    @ApiParam("目标库位编号")
+    public String descLocateNo;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -123,12 +123,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
         DdlPackBean packBean = new DdlPackBean();
-        StringBuffer orderNoStr = new StringBuffer();
-        for (int i = 0; i < orderNos.size(); i++) {
-            orderNoStr.append("'" + orderNos.get(i) + "',");
-        }
-        orderNoStr.deleteCharAt(orderNoStr.length() - 1);
-        DdlPreparedPack.getInPack(orderNoStr.toString(), "orderNo", packBean);
+        DdlPreparedPack.getInPack(orderNos, "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getOrderByPack(