Merge remote-tracking branch 'origin/master'

oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java

@@ -74,6 +74,6 @@ public class CrmFileService {
                 datum.setFilePath(fileUploadComponent.getUrlPrefix() + datum.getFilePath());
             }
         }
-        return crmFileFeign.getPcAppendix(query);
+        return rb.success().setData(data);
     }
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -41,6 +41,7 @@ import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto;
 import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
+import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum;
 import com.yxt.oms.feign.goods.basebrandinfo.BaseBrandInfoFeign;
 import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign;
 import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign;
@@ -89,6 +90,11 @@ public class PurchaseBillService {
         pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
         pq.getParams().setIndex(dataRule.getIndex());
         PagerVo<PurchaseBillVo> p = purchaseBillFeign.listPage(pq).getData();
+        for (PurchaseBillVo record : p.getRecords()) {
+            WarehouseAnsBillNum data = warehouseAnsBillFeign.selByExternalNo(record.getBillNo()).getData();
+            record.setEnterWareCount(data.getActualInCount());
+            record.setEnterWareAmount(data.getActualInCount().multiply(data.getPrice()));
+        }
         return rb.success().setData(p);
     }
 

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/warehouseansbilldetail/WarehouseAnsBillNum.java

@@ -0,0 +1,20 @@
+package com.yxt.oms.biz.func.warehouseansbilldetail;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/11
+ **/
+@Data
+public class WarehouseAnsBillNum {
+
+
+    private BigDecimal actualInCount;
+    private BigDecimal price;
+}

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

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java

@@ -7,6 +7,7 @@ import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -58,4 +59,8 @@ public interface WarehouseAnsBillFeign {
     @GetMapping("details")
     @ApiOperation("详情")
     ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid);
+
+    @GetMapping("selByExternalNo")
+    @ApiOperation("根据外部单号查询实际入库数量及单价")
+    ResultBean<WarehouseAnsBillNum> selByExternalNo(@RequestParam("billNo") String billNo);
 }

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java

@@ -7,6 +7,7 @@ import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum;
 import org.springframework.stereotype.Component;
 
 /**
@@ -45,4 +46,9 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign {
 	public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<WarehouseAnsBillNum> selByExternalNo(String billNo) {
+		return null;
+	}
 }