From e837f2a66d53b963fd23fa137bed1177775739d9 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 14 Oct 2022 11:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java    | 3 ---
 .../com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java | 3 ---
 .../yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java   | 6 +++---
 .../com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java  | 3 ---
 .../scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml   | 2 +-
 .../yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java | 5 ++---
 6 files changed, 6 insertions(+), 16 deletions(-)

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}
     </select>
 
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<ScmWarehouseMapper,
             qw.eq("useOrgSid", query.getUseOrgSid());
         }
 
-        if (StringUtils.isNotBlank(query.getWarehouseCode())) {
-            qw.eq("warehouseCode", query.getWarehouseCode());
+        if (StringUtils.isNotBlank(query.getGressionCode())) {
+            qw.eq("gressionCode", query.getGressionCode());
         }
 
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
@@ -107,7 +107,6 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
     public void saveOrUpdateDto(ScmWarehouseDto dto) {
         ScmWarehouse entity = new ScmWarehouse();
         dto.fillEntity(entity);
-        entity.setWarehouseCode(dto.getGressionCode());
         this.saveOrUpdate(entity);
     }