增加商品spuSid返回值查询spu中商品有效期

增加是否质检、质检状态默认值

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<WarehouseReceiptBillMapper, WarehouseReceiptBill> {
 
-    @Autowired
+    @Resource
     private WarehouseReceiptBillFeign warehouseReceiptBillFeign;
+    @Resource
+    private BaseGoodsSkuFeign baseGoodsSkuFeign;
+    @Resource
+    private BaseGoodsSpuFeign baseGoodsSpuFeign;
 
     public ResultBean<PagerVo<WarehouseReceiptBillPageVo>> listPage(PagerQuery<WarehouseReceiptBillQuery> pq) {
         return warehouseReceiptBillFeign.listPage(pq);
@@ -38,7 +48,15 @@ public class WarehouseReceiptBillService extends MybatisBaseService<WarehouseRec
     }
 
     public ResultBean<WarehouseReceiptBillVo> getInitDetails(String sourceSid) {
-        return warehouseReceiptBillFeign.getInitDetails(sourceSid);
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseReceiptBillVo warehouseReceiptBillVo = warehouseReceiptBillFeign.getInitDetails(sourceSid).getData();
+        List<WarehouseReceiptBillDetailVo> 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<WarehouseReceiptBillInitVo> getDetailsInit(String sid) {

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<WarehouseReceiptBillDetailVo> list = new ArrayList<>();
+
+    @ApiModelProperty("批次列表")
+    private List<WarehouseReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
+
 }

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;

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;