From 3acbcde84f2f0e0569bdf9e39f1a8b3f4a829e34 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 21 Oct 2024 14:38:00 +0800 Subject: [PATCH 1/3] 1 --- .../purchasebill/PurchaseBillService.java | 6 ++++++ .../WarehouseAnsBillNum.java | 20 +++++++++++++++++++ .../WarehouseAnsBillFeign.java | 5 +++++ .../WarehouseAnsBillFeignFallback.java | 6 ++++++ 4 files changed, 37 insertions(+) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index eb83bca..9ae0e25 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/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 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); } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java new file mode 100644 index 0000000..02e6574 --- /dev/null +++ b/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; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java index a24e7b6..72ecaa3 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java +++ b/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 details(@RequestParam("sid") String sid); + + @GetMapping("selByExternalNo") + @ApiOperation("根据外部单号查询实际入库数量及单价") + ResultBean selByExternalNo(@RequestParam("billNo") String billNo); } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java index 9182ddf..4ea4895 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java +++ b/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 details(String sid) { return null; } + + @Override + public ResultBean selByExternalNo(String billNo) { + return null; + } } \ No newline at end of file From d09888efa768c7e44a573e14456c0ff9e2242f2e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 22 Oct 2024 09:42:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E4=BA=AB?= =?UTF-8?q?=E9=80=9A=E5=AE=A2=E6=88=B7=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java index b3f20b3..65b7432 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmfile/CrmFileService.java +++ b/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); } } 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 3/3] =?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 discounts; //优惠详情 private List 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