Merge remote-tracking branch 'origin/master'

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;
 }

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());

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;//纬度

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;//纬度

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;//纬度

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);
 }