解决冲突

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

@@ -50,4 +50,8 @@ public class WmsActionStepCall extends BaseBean {
 
     @ApiParam(value = "组件描述")
     public transient String amDesc;
+
+    @Column(name="AM_TYPE")
+    @ApiParam(value = "组件类型")
+    public transient Integer amType;
 }

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

@@ -240,7 +240,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
+        HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
         HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
@@ -1000,8 +1000,10 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result);
         HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result);
 
         getStringBuilderPack(wmsActionStepCall, result);
+
         HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
 
         return result.toString();
@@ -1116,6 +1118,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result);
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result);
         getStringBuilderPack(wmsActionStepCallParam, result);