Merge branch 'dev' into test

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

@@ -95,7 +95,7 @@ public class WmsEnumUtil {
         SUB(20, "SUB", "委外采购"),
         TAR(30, "TAR", "多角贸易采购"),
         TAP(40, "TAP", "多角代采购"),
-        AMP(50, "AMP", "AMP拉动");
+        AMP(50, "AMP", "AMP收货");
 
         private int value;
         private String code;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description SAP_单据锁定 DAO层接口
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock;
  * @CreateDate 2019/6/29 18:35
  * @Modify
  */
+@Repository
 public interface WmsSapOrderLockRepository extends BaseRepository<WmsSapOrderLock, Long> {
 }

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

@@ -1412,7 +1412,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);