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

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

@@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -15,8 +13,4 @@ import java.util.List;
  * @Modify:
  **/
 public interface WmsActionStepCallRepository extends BaseRepository<WmsActionStepCall, Long> {
-
-    @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ")
-    List<WmsActionStepCall> findWmsActionStepCallByAmid(@Param("id") long id);
-
 }

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

@@ -470,7 +470,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //发运单号
-        HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
         HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
         //物料编码