解决冲突

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

@@ -853,9 +853,9 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getWhNo(),"whNo",result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getZoneNo(),"zoneNo",result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getLocateNo(),"locateNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"whNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"zoneNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"locateNo",result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result);
         HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result);
@@ -1063,7 +1063,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result);
-        HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
+        HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
         getStringBuilderPack(wmsActionModuleParam, result);
 
         return result.toString();