From b6d543c833256647fa5c8ea60368c2f21b888532 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 2 Jul 2024 16:08:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81spuSid?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E6=9F=A5=E8=AF=A2spu=E4=B8=AD?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=9C=89=E6=95=88=E6=9C=9F=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E8=B4=A8=E6=A3=80=E3=80=81=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseReceiptBillService.java | 22 +++++++++++++++++-- .../WarehouseReceiptBillVo.java | 5 +++++ .../WarehouseReceiptBillDetailVo.java | 2 +- .../basegoodssku/BaseGoodsSkuDetailsVo.java | 2 ++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillService.java index 2ef7d48..47a1f14 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillService.java @@ -11,10 +11,16 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo; +import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.wms.feign.base.basegoodsspu.BaseGoodsSpuFeign; import com.yxt.wms.feign.warehouse.warehousereceiptbill.WarehouseReceiptBillFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -26,8 +32,12 @@ import java.util.stream.Collectors; @Service public class WarehouseReceiptBillService extends MybatisBaseService { - @Autowired + @Resource private WarehouseReceiptBillFeign warehouseReceiptBillFeign; + @Resource + private BaseGoodsSkuFeign baseGoodsSkuFeign; + @Resource + private BaseGoodsSpuFeign baseGoodsSpuFeign; public ResultBean> listPage(PagerQuery pq) { return warehouseReceiptBillFeign.listPage(pq); @@ -38,7 +48,15 @@ public class WarehouseReceiptBillService extends MybatisBaseService getInitDetails(String sourceSid) { - return warehouseReceiptBillFeign.getInitDetails(sourceSid); + ResultBean rb = ResultBean.fireFail(); + WarehouseReceiptBillVo warehouseReceiptBillVo = warehouseReceiptBillFeign.getInitDetails(sourceSid).getData(); + List list = warehouseReceiptBillVo.getList(); + for (WarehouseReceiptBillDetailVo warehouseReceiptBillDetailVo : list) { + BaseGoodsSkuDetailsVo baseGoodsSkuDetailsVo = baseGoodsSkuFeign.getDetails(warehouseReceiptBillDetailVo.getGoodsSkuSid()).getData(); + BaseGoodsSpuVo baseGoodsSpuVo = baseGoodsSpuFeign.initialization(baseGoodsSkuDetailsVo.getGoodsSpuSid()).getData(); + warehouseReceiptBillDetailVo.setShelfLife(Integer.parseInt(baseGoodsSpuVo.getShelfLife())); + } + return rb.success().setData(warehouseReceiptBillVo); } public ResultBean getDetailsInit(String sid) { diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillVo.java index a9c494b..c9a01ed 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbill/WarehouseReceiptBillVo.java @@ -1,6 +1,7 @@ package com.yxt.wms.biz.func.warehousereceiptbill; import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; +import com.yxt.wms.biz.func.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,4 +49,8 @@ public class WarehouseReceiptBillVo { private String createOrgSid; private List list = new ArrayList<>(); + + @ApiModelProperty("批次列表") + private List pcList = new ArrayList<>(); + } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java index fd586d9..1c20938 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehousereceiptbilldetail/WarehouseReceiptBillDetailVo.java @@ -35,7 +35,7 @@ public class WarehouseReceiptBillDetailVo { private String rejectCount; @ApiModelProperty("拒收原因") private String rejectReason; - @ApiModelProperty("是否需要质检（不需要0，需要1）") + @ApiModelProperty("是否质检（是0，否1）") private Integer isQuality; @ApiModelProperty("质检状态（合格0，不合格1）") private Integer qualityState; diff --git a/wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuDetailsVo.java b/wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuDetailsVo.java index 9e31af9..263920d 100644 --- a/wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuDetailsVo.java +++ b/wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuDetailsVo.java @@ -32,6 +32,8 @@ public class BaseGoodsSkuDetailsVo { private String manufacturersid; @ApiModelProperty("商品单位sid") private String goodsUnitSid; + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; @ApiModelProperty("商品单位名称") private String goodsUnitName;