解决冲突

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

@@ -45,6 +45,6 @@ public class WmsTransType extends BaseBean {
     @Column(name = "PROG_CODE")
     @ApiParam(value = "处理程序", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long progCode;
+    private Long agId;
 
 }

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

@@ -242,7 +242,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
-        HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
+        HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
         getStringBuilderPack(wmsTransType, result);