From a5df42540e32093fa058a3ed067afaa1c0069873 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sat, 25 Jun 2022 22:30:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=E4=B8=8Abug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/admin/controller/basic/SpsSyncUploadController.java  | 4 ++--
 .../com/glxp/sale/admin/res/inventory/InvProductResponse.java | 1 +
 .../resources/mybatis/mapper/inventory/InvPreInProductDao.xml | 2 +-
 .../resources/mybatis/mapper/inventory/InvPreProductDao.xml   | 1 +
 .../main/resources/mybatis/mapper/inventory/InvProductDao.xml | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
index 7b8486b..8eec560 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
@@ -162,7 +162,7 @@ public class SpsSyncUploadController {
         //仓库用户表
         if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
             for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
-                warehouseUserDao.insertOrUpdate(warehouseUserEntity);
+                warehouseUserDao.insert(warehouseUserEntity);
             }
             remark.append("仓库用户信息：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n");
         }
@@ -170,7 +170,7 @@ public class SpsSyncUploadController {
         //仓库单据类型表
         if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) {
             for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) {
-                warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity);
+                warehouseBussinessTypeDao.insert(warehouseUserEntity);
             }
 
             remark.append("仓库所属单据类型：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n");
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java
index f57d24a..a03287a 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java
@@ -24,6 +24,7 @@ public class InvProductResponse {
     private String invStorageCode;
     private String invStorageName;
     private String invSubStorageName;
+    private String invWarehouseCode;
 
     public Integer getInCount() {
         if (inCount == null)
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index 616d9f4..6ad361c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -124,7 +124,7 @@
         ,inv_prein_product.reCount,inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
         invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name
-        invSubStorageName
+        invSubStorageName,inv_product.invWarehouseCode
         FROM inv_prein_product
         inner join basic_udirel on inv_prein_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
index b40d2f8..72ec55d 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
@@ -122,6 +122,7 @@
         ,inv_pre_product.reCount,inv_pre_product.customerId,
         basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name
         invStorageName,inv_pre_product.invStorageCode,inv_pre_product.price, inv_warehouse_sub.name invSubStorageName
+        ,inv_product.invWarehouseCode
         FROM inv_pre_product
         inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
index 08b38af..1efa537 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -121,7 +121,7 @@
         inv_product.inCount,inv_product.outCount
         ,inv_product.reCount,inv_product.customerId,basic_corp.name companyName,inv_product.unitFk,inv_product.supId
         ,inv_warehouse.name invStorageName,inv_product.invStorageCode,inv_product.price,
-        inv_warehouse_sub.name invSubStorageName
+        inv_warehouse_sub.name invSubStorageName,inv_product.invWarehouseCode
         FROM inv_product
         inner join basic_udirel on inv_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid