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/enumutil/WmsEnumUtil.java

@@ -645,14 +645,15 @@ public class WmsEnumUtil {
         ALLOCATION(40, "ALLOCATION", "调拨"),
         SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
         SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
-        NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"),
+        NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
         SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),
         CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
         PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
         INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
         SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
         RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
-        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回");
+        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
+        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库");
 
         private int value;
         private String code;

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

@@ -1313,8 +1313,8 @@ public class WmsHqlPack {
     public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result);
-        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         getStringBuilderPack(wmsStockSn, result);
+        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         return result.toString();
     }