From 7b5d80ea5f8b96c46734400b34cb63d60a2d3919 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 2 Aug 2024 14:23:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=8E=B7=E5=8F=96=E5=8D=95=E4=BD=8Dsid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/func/crmcustomer/CrmCustomerTempDto.java | 1 + .../func/crmcustomer/CrmCustomerTempService.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java index 8ebf4b9..cacb47c 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java @@ -146,4 +146,5 @@ public class CrmCustomerTempDto implements Dto { private String customerOrgSid; private String customerOrgName; + } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java index fb81c9d..0460921 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java @@ -159,13 +159,13 @@ public class CrmCustomerTempService { dto.fillEntity(crmCustomerTemp); crmCustomerTemp.setCreateBySid(dto.getUserSid()); crmCustomerTemp.setStaffSid(sysUserInfoVo.getStaffSid()); - String orgSid = ""; - if (StringUtils.isNotBlank(dto.getOrgPath())) { - orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); - } else { - orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); - } - crmCustomerTemp.setCreateOrgSid(orgSid); +// String orgSid = ""; +// if (StringUtils.isNotBlank(dto.getOrgPath())) { +// orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); +// } else { +// orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); +// } + crmCustomerTemp.setCreateOrgSid(dto.getCreateOrgSid()); ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0"); if (resultBean.getSuccess() && resultBean.getData() != null) { String key = resultBean.getData().toString(); From f0ea8e6c6480e707205df1f9001014168e7f08a6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 2 Aug 2024 15:08:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=20=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java index 5043c93..4aff57f 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java @@ -49,7 +49,7 @@ public class PurchaseBillQuery implements Query { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("采购员") - private String purchaserSid; + private String purchaserName; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("发货状态key") From 215d184953f096c3c7cf40bd4cc908ec53a092b4 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 2 Aug 2024 15:57:35 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=95=86=E4=BA=AB=E9=80=9A=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java index 981b645..588c550 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java @@ -133,7 +133,7 @@ public class SmsSalesBillDetailsVo implements Vo { private String taxRate; // 税率 //商品信息 @ApiModelProperty("商品列表") - private List goodsList; // 商品列表 + private List goodsList = new ArrayList<>(); // 商品列表 //费用信息 @ApiModelProperty("折扣率") @@ -158,7 +158,7 @@ public class SmsSalesBillDetailsVo implements Vo { private String advanceBalance; // 预收款余额 //结算 @ApiModelProperty("结算账户") - private List accounts; + private List accounts = new ArrayList<>(); @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 @ApiModelProperty("结算账户") From babe184885880da106767b329d0ea509568eaff4 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 5 Aug 2024 09:00:53 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=95=86=E4=BA=AB=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/func/crmcustomer/CrmCustomerTempQuery.java | 12 ++++++++++-- .../func/crmcustomer/CrmCustomerTempService.java | 14 +++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempQuery.java index 05e176f..4ca39f5 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempQuery.java @@ -49,8 +49,7 @@ public class CrmCustomerTempQuery implements Query { @ApiModelProperty("业务员sid") private String staffSid; - @ApiModelProperty("用户sid") - private String userSid; + @ApiModelProperty("客户sid") private List customerSidList; @@ -65,4 +64,13 @@ public class CrmCustomerTempQuery implements Query { private String staffName; private String useOrgSid; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java index 0460921..515f5bf 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java @@ -7,6 +7,8 @@ import com.yxt.common.base.utils.HttpStatusEnum; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.commonmethod.CommonMethod; +import com.yxt.oms.biz.func.commonmethod.DataRule; import com.yxt.oms.biz.func.crmfile.CommonAppendixSelectQuery; import com.yxt.oms.biz.func.crmfile.CommonAppendixVo; import com.yxt.oms.biz.func.crmfile.CommonAttachTypeEnum; @@ -68,12 +70,14 @@ public class CrmCustomerTempService { private DictCommonFeign dictCommonFeign; @Resource private SysOrganizationFeign sysOrganizationFeign; - + @Autowired + private CommonMethod commonMethod; public ResultBean> listPageVo(PagerQuery pq) { - if (StringUtils.isNotBlank(pq.getParams().getUserSid())) { - String staffSid = sysUserFeign.selectBySid(pq.getParams().getUserSid()).getData().getStaffSid(); - pq.getParams().setStaffSid(staffSid); - } + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + CrmCustomerTempQuery query = pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); return crmCustomerTempFeign.listPage(pq); } From bbaec3b5f56be4b6c00e0c9fabbb6941ab793244 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 11:20:08 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E5=8D=95=E4=BD=8D=E4=B8=8B?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=8C=E6=88=90=20=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=BF=94=E5=9B=9E=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E7=A8=8E=E7=8E=87=EF=BC=8C=E4=BF=9D=E5=AD=98=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=8D=95=E4=BF=9D=E5=AD=98=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E5=88=B0=E9=87=87=E8=B4=AD=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/biz/func/purchasebill/GoodsSkuPurSelectList.java | 4 ++++ .../oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java | 6 +----- .../purchasebilldetail/PurchaseBillDetailDetailsVo.java | 2 ++ .../biz/func/purchasebilldetail/PurchaseBillDetailDto.java | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 9d2faa5..5b5fd49 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -36,6 +36,10 @@ public class GoodsSkuPurSelectList { private BigDecimal cost; //单价1 private BigDecimal cost1; + //保质期 + private String shelfLife; + //税率 + private BigDecimal taxRate; //货号 private String itemNumber; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java index 3684cf8..581c3d6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java @@ -15,10 +15,6 @@ public class GoodsSkuPurSelectQuery implements Query { private String goodsSkuCode; //商品名称 private String goodsName; - //商品条码 - private String barCode; - //规格名称 - private String goodsSkuOwnSpec; - private String orgPath; + private String createOrgSid; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java index 369f08c..6785d18 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -99,6 +99,8 @@ public class PurchaseBillDetailDetailsVo implements Vo { private Date deliveryDate; @ApiModelProperty("总税额") private BigDecimal taxAmount; + @ApiModelProperty("保质期") + private Integer shelfLife; /* * 商品扩展字段 diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java index a252456..20c01bb 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java @@ -94,6 +94,8 @@ public class PurchaseBillDetailDto implements Dto { private String deliveryDate; @ApiModelProperty("总税额") private BigDecimal taxAmount; + @ApiModelProperty("保质期") + private Integer shelfLife; /* * 商品扩展字段 From c49c7a2d1781cdffd9ed519b5145cf5dfb88fa92 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 11:33:25 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8=E5=A2=9E=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java index 4aff57f..386c315 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java @@ -65,4 +65,7 @@ public class PurchaseBillQuery implements Query { @ApiModelProperty("用户sid") private String userSid; private int index; + + @ApiModelProperty("审核状态key") + private String examineStateKey; } From 58d195037ed43ddd73d3483637716af4287fd3d0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 6 Aug 2024 14:52:05 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=BF=94=E5=9B=9E=E5=95=86=E5=93=81=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/func/smssalesbill/GoodsCountVo.java | 20 ++++++++++++++++++ .../biz/func/smssalesbill/ReviewGoods.java | 2 ++ .../smssalesbill/SmsSalesBillService.java | 21 +++++++++++++++++-- .../WarehouseInventoryFeign.java | 5 +++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java new file mode 100644 index 0000000..ef89323 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/6 14:44 + */ +@Data +public class GoodsCountVo { + + @ApiModelProperty("实际库存") + private String inventoryCount; // 库存数量 + @ApiModelProperty("可分配库存") + private String allocateCount; // 可分配库存 + @ApiModelProperty("可用库存") + private String useCount; // 可用库存 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java index a1cdf23..5c1e073 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java @@ -19,6 +19,8 @@ public class ReviewGoods { private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Sku名称") private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("goodsSkuSid") + private String goodsSkuSid; // goodsSkuSid @ApiModelProperty("商品编码") private String goodsSkuCode; // 商品编码 @ApiModelProperty("规格型号") 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 3666912..af90c80 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 @@ -34,10 +34,12 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign; +import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import java.util.ArrayList; @@ -61,7 +63,8 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -115,7 +118,21 @@ public class SmsSalesBillService extends MybatisBaseService reviewDetails(String sid) { - return smsSalesBillFeign.reviewDetails(sid); + ResultBean rb = ResultBean.fireFail(); + ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData(); + List goods = data.getGoods(); + if (!goods.isEmpty()) { + for (ReviewGoods good : goods) { + String goodsSkuSid = good.getGoodsSkuSid(); + GoodsCountVo goodsCountVo = warehouseInventoryFeign.selCountsBySkuSid(goodsSkuSid); + if (null != goodsCountVo) { + good.setAllocateCount(goodsCountVo.getAllocateCount()); + good.setUseCount(goodsCountVo.getUseCount()); + good.setInventoryCount(goodsCountVo.getInventoryCount()); + } + } + } + return rb.success().setData(data); } public ResultBean saveShipper(ReviewDetailsVo dto) { 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 abc23fb..f693f2a 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 @@ -1,6 +1,7 @@ package com.yxt.oms.feign.warehouse.warehouseInventory; import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.smssalesbill.GoodsCountVo; import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,4 +34,8 @@ public interface WarehouseInventoryFeign { @ApiOperation("根据skuSid查询商品库存") @PostMapping("/selInventoryCountBySkuSid") public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid); + + @ApiOperation("根据skuSid查询商品库存") + @PostMapping("/selCountsBySkuSid") + public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid); } From 3361d03d3334037f56a01952badcac81bc6c9ea3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 6 Aug 2024 17:23:17 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=9C=B0=E4=BB=98=E6=AC=BE=E3=80=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81=E3=80=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java index a0acd35..9f42539 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java @@ -68,4 +68,9 @@ public class PurchaseBillExVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("最后修改时间") private Date modifyTime; + + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态value") + private String deliveryStateValue; }