diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java index da6aa3d8b3..c05de658b2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java @@ -57,9 +57,6 @@ public class ScmWarehouse extends BaseEntity { @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("编码") - private String warehouseCode; // 编码 - @ApiModelProperty("名称") private String warehouseName; // 名称 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java index f7dbd67313..c5d8fac160 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java @@ -56,9 +56,6 @@ public class ScmWarehouseDto implements Dto { @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("编码") - private String warehouseCode; // 编码 - @ApiModelProperty("名称") private String warehouseName; // 名称 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java index 3c545b6df7..3635f4fbb9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java @@ -51,9 +51,9 @@ public class ScmWarehouseQuery implements Query { @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - - @ApiModelProperty("编码") - private String warehouseCode; // 编码 + + @ApiModelProperty("库存地点编号") + private String gressionCode; @ApiModelProperty("名称") private String warehouseName; // 名称 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java index 4a4cb6c7aa..0ece91906b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java @@ -58,9 +58,6 @@ public class ScmWarehouseVo implements Vo { @ApiModelProperty("使用组织sid") private String[][] useOrgSid; // 使用组织sid - @ApiModelProperty("编码") - private String warehouseCode; // 编码 - @ApiModelProperty("名称") private String warehouseName; // 名称 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml index 26eaf5c95e..c42e672924 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml @@ -17,7 +17,7 @@ sw.warehouseContract, DATE_FORMAT(si.inboundDate, '%Y-%m-%d') as inboundDate from scm_vehicle_inbound si - left join scm_warehouse sw on si.warehouseCode = sw.warehouseCode + left join scm_warehouse sw on si.warehouseCode = sw.gressionCode ${ew.customSqlSegment} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index 56b555aa3c..d01bc6e112 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -64,8 +64,8 @@ public class ScmWarehouseService extends MybatisBaseService