库存

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java

@@ -10,6 +10,7 @@ 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.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
@@ -106,6 +107,16 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
     public ResultBean<String> inspectionWarehousing(PurchaseInventoryBillDto2 dto) {
         SysStaffinfo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySidP(dto.getUserSid()).getData();
         dto.setUserName(sysStaffinfoDetailsVo.getName());
+        for (PurchaseInventoryBillDetailDto2 purchaseInventoryBillDetailDto2 : dto.getList()) {
+            BaseGoodsSkuVo vo=goodsSkuFeign.initialization(purchaseInventoryBillDetailDto2.getGoodsSkuSid()).getData();
+            BaseGoodsSpuVo v=goodsSpuFeign.initialization(vo.getGoodsSpuSid()).getData();
+            purchaseInventoryBillDetailDto2.setGoodsBrandSid(v.getBrandSid());
+            purchaseInventoryBillDetailDto2.setGoodsBrandName(v.getBrandName());
+            purchaseInventoryBillDetailDto2.setGoodsTypeSid(v.getGoodsTypeSid());
+            purchaseInventoryBillDetailDto2.setGoodsTypeName(v.getTypeName());
+            purchaseInventoryBillDetailDto2.setManufacturerName(v.getManufacturerName());
+            purchaseInventoryBillDetailDto2.setManufacturerSid(v.getManufacturerSid());
+        }
         return purchaseInventoryBillFeign.inspectionWarehousing(dto);
     }
 }

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java

@@ -54,4 +54,10 @@ public class PurchaseInventoryBillDetail extends BaseEntity {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     private String remarks;
+    private String goodsBrandSid;
+    private String goodsBrandName;
+    private String goodsTypeSid;
+    private String goodsTypeName;
+    private String manufacturerSid;
+    private String manufacturerName;
 }

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java

@@ -55,4 +55,10 @@ public class PurchaseInventoryBillDetailDto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     private String remarks;
+    private String goodsBrandSid;
+    private String goodsBrandName;
+    private String goodsTypeSid;
+    private String goodsTypeName;
+    private String manufacturerSid;
+    private String manufacturerName;
 }

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java

@@ -66,4 +66,10 @@ public class PurchaseInventoryBillDetailDto2 {
     private String remarks;
     private String warehouseName;
     private String warehouseSid;
+    private String goodsBrandSid;
+    private String goodsBrandName;
+    private String goodsTypeSid;
+    private String goodsTypeName;
+    private String manufacturerSid;
+    private String manufacturerName;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryQuery.java

@@ -26,7 +26,7 @@ public class WarehouseInventoryQuery implements Query {
 
     @ApiModelProperty("条码")
     private String barCode;
-    private String hh;
+    private String itemNumber;
     private String orgLevelKey;//权限等级
     @ApiModelProperty("菜单路由")
     private String menuUrl;

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java

@@ -8,12 +8,15 @@ 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.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillQuery;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 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.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.warehouse.warehousesinventory.WarehouseInventoryFeign;
@@ -39,17 +42,30 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     @Resource
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
     @Resource
+    private BaseGoodsSpuFeign baseGoodsSpuFeign;
+    @Resource
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private CommonMethod commonMethod;
     public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(PagerQuery<WarehouseInventoryQuery> pq) {
+        ResultBean rb=new ResultBean().fail();
         WarehouseInventoryQuery 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 warehouseInventoryFeign.listPage(pq);
+        PagerVo<WarehouseInventoryVo>warehouseInventoryVoPagerVo=warehouseInventoryFeign.listPage(pq).getData();
+        for (WarehouseInventoryVo record : warehouseInventoryVoPagerVo.getRecords()) {
+            BaseGoodsSpuVo v=baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()).getData();
+            record.setSid(record.getGoodsSpuSid());
+            record.setBarCode(v.getBarCode());
+            record.setGoodsSpuCode(v.getGoodsCode());
+            for (WarehouseInventoryVo child : record.getChildren()) {
+                child.setSid(child.getGoodsSkuSid());
+            }
+        }
+        return rb.success().setData(warehouseInventoryVoPagerVo);
     }
     public ResultBean<PagerVo<WarehouseInventoryVo>> locationListPage(PagerQuery<WarehouseInventoryQuery> pq) {
         WarehouseInventoryQuery query=pq.getParams();

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryVo.java

@@ -21,15 +21,20 @@ public class WarehouseInventoryVo implements Vo {
     private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
+    private String goodsSpuCode;
+    private String barCode;
     private String goodsSkuSid;
     @ApiModelProperty("商品编码")
     private String goodsSkuCode;
+    private String goodsSkuTitle;
     @ApiModelProperty("规格型号")
     private String goodsSkuOwnSpec;
     @ApiModelProperty("计量单位")
     private String unit;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    private String warehouseAreaName;
+    private String warehouseRackSid;
     @ApiModelProperty("库位名称")
     private String warehouseRackCode;
     @ApiModelProperty("现有库存")
@@ -62,6 +67,8 @@ public class WarehouseInventoryVo implements Vo {
     private String batchNumber;
     @ApiModelProperty("序列号")
     private String serialNumber;
-    private List<WarehouseInventoryVo> warehouseInventorys=new ArrayList<>();
+    private String brandName;
+    private String typeName;
+    private List<WarehouseInventoryVo> children=new ArrayList<>();
 
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventoryrecord/WarehouseInventoryRecordQuery1.java

@@ -10,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class WarehouseInventoryRecordQuery1 implements Query {
+    private String sid;
+    private String type;
     private String billSid;
     private String goodsSpuName;
     private String goodsSkuTitle;

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeign.java

@@ -9,10 +9,7 @@ import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -37,5 +34,7 @@ public interface BaseGoodsSkuFeign {
     @ApiOperation("入库添加商品列表")
     @PostMapping("/getSelectList")
     ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery);
-
+    @ApiOperation("初始化")
+    @GetMapping("/initialization/{sid}")
+    public ResultBean<BaseGoodsSkuVo> initialization(@PathVariable("sid") String sid);
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

@@ -32,4 +32,9 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
     public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<BaseGoodsSkuVo> initialization(String sid) {
+        return null;
+    }
 }