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

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

@@ -36,7 +36,7 @@ public class WmsLocatePart extends BaseBean{
     @ApiParam(value ="物料编码")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name="PART_NAME_RDD")
     @ApiParam(value ="物料名称")
-    private String partName;
+    private String partNameRdd;
 }

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

@@ -207,7 +207,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result);
@@ -545,6 +545,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
         HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
+        //物料编码
+        HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
         //条码
         HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result);
         //发运状态