From b2e3c313b2c0c6cae79621edb31a75d643bdb84c Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 28 Oct 2024 16:28:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E4=BA=AB?=
 =?UTF-8?q?=E9=80=9A=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java | 1 +
 .../com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java  | 2 +-
 .../warehouse/warehouseInventory/WarehouseInventoryFeign.java   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java
index 41570ce..814ce3d 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java
@@ -19,4 +19,5 @@ public class ReviewDetailsVo {
     private ReviewInvoice invoice = new ReviewInvoice(); //发票信息
     private List<ReviewDiscount> discounts; //优惠详情
     private List<ReviewRecord> records; //操作记录
+    private String useOrgSid;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
index 90d6d62..1c59274 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
@@ -178,7 +178,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
         if (!goods.isEmpty()) {
             for (ReviewGoods good : goods) {
                 String goodsSkuSid = good.getGoodsSkuSid();
-                GoodsCountVo goodsCountVo = warehouseInventoryFeign.selCountsBySkuSid(goodsSkuSid);
+                GoodsCountVo goodsCountVo = warehouseInventoryFeign.selCountsBySkuSid(goodsSkuSid,data.getUseOrgSid());
                 if (null != goodsCountVo) {
                     good.setAllocateCount(goodsCountVo.getAllocateCount());
                     good.setUseCount(goodsCountVo.getUseCount());
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
index f693f2a..fde2dad 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
@@ -37,5 +37,5 @@ public interface WarehouseInventoryFeign {
 
     @ApiOperation("根据skuSid查询商品库存")
     @PostMapping("/selCountsBySkuSid")
-    public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid);
+    public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid,@RequestParam("useOrgSid") String useOrgSid);
 }

From 9613f91a196d6eccecf6ef45fe38ff43db2e585a Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 28 Oct 2024 17:15:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=20=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java   | 1 +
 .../com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java     | 1 +
 .../java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java | 1 +
 3 files changed, 3 insertions(+)

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java
index a3c79ba..fe39d53 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java
@@ -18,6 +18,7 @@ public class WarehouseInfo extends BaseEntity {
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址
+    private String belongingPlace;//归属地
     private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java
index aeeb455..b06b1c1 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoDto.java
@@ -32,6 +32,7 @@ public class WarehouseInfoDto implements Dto {
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址
+    private String belongingPlace;//归属地
     private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java
index 398307c..73a712b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoVo.java
@@ -33,6 +33,7 @@ public class WarehouseInfoVo implements Vo {
     private String manager;//主管
     private String areaSid;//地区sid
     private String address;//地址
+    private String belongingPlace;//归属地
     private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度