库位库存

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryHistoryRest.java

@@ -32,4 +32,10 @@ public class WarehouseInventoryHistoryRest {
     public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryHistoryQuery> pq){
         return warehouseInventoryHistoryService.listPage(pq);
     }
+    @ApiOperation("分页列表")
+    @PostMapping("/saveHistory")
+    public void saveHistory(){
+         warehouseInventoryHistoryService.saveHistory();
+    }
+
 }

src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java

@@ -172,7 +172,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             List<PurchaseInventoryBillDetailDto2> list = dto2.getList();
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list);
+                rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,userSid,userName);
                 if (!rb.getCode().equals("200")) {
                     return rb;
                 }
@@ -219,7 +219,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             List<PurchaseInventoryBillDetailDto2> list = dto2.getList();
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list);
+                rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,userSid,userName);
                 if (!rb.getCode().equals("200")) {
                     return rb;
                 }
@@ -245,7 +245,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             List<PurchaseInventoryBillDetailDto2> list = dto.getList();
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list);
+                rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,"","");
                 if (!rb.getCode().equals("200")) {
                     return rb;
                 }
@@ -267,7 +267,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             List<PurchaseInventoryBillDetailDto2> list = dto.getList();
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list);
+                purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,"","");
             }
             baseMapper.updateById(wmsReceiptBill);
         }
@@ -322,37 +322,21 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
         for (PurchaseInventoryBillDetailDto2 dto2 : list) {
             dto2.setSourceBillSid(purchaseInventoryBill.getSid());
             purchaseInventoryBillDetailService.saveOrUpdate(dto2);
-            WarehouseInventory warehouseInventory=new WarehouseInventory();
+            WarehouseInventoryDto warehouseInventory=new WarehouseInventoryDto();
-            warehouseInventory.setBatchNumber(dto2.getBatch());
+            BeanUtil.copyProperties(dto2,warehouseInventory);warehouseInventory.setBatchNumber(dto2.getBatch());
-            warehouseInventory.setGoodsSpuName(dto2.getGoodsSpuName());
-            warehouseInventory.setGoodsSkuSid(dto2.getGoodsSkuSid());
-            warehouseInventory.setGoodsSkuTitle(dto2.getGoodsSkuTitle());
-            warehouseInventory.setGoodsSkuCode(dto2.getGoodsSkuCode());
             warehouseInventory.setGoodsSkuOwnSpec(dto2.getOwnSpec());
             warehouseInventory.setUnit(dto2.getGoodsUnitName());
-            warehouseInventory.setCount(dto2.getCount());
             warehouseInventory.setAllocateCount(new BigDecimal(0));
             warehouseInventory.setPickCount(new BigDecimal(0));
             warehouseInventory.setFreezeCount(new BigDecimal(0));
             warehouseInventory.setCost(dto2.getCostPrice());
-            warehouseInventory.setWarehouseRackSid(dto2.getWarehouseRackSid());
             WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().eq("sid",dto2.getWarehouseRackSid()));
             warehouseInventory.setWarehouseSid(warehouseRack.getWarehouseSid());
             WarehouseInfo warehouseInfo=warehouseInfoService.getOne(new QueryWrapper<WarehouseInfo>().eq("sid",warehouseRack.getWarehouseSid()));
             warehouseInventory.setWarehouseName(warehouseInfo.getWarehouseName());
             warehouseInventory.setWarehouseRackCode(warehouseRack.getRackCode());
             warehouseInventory.setFirstInDate(new Date());
-            warehouseInventory.setUseOrgSid(dto.getUseOrgSid());
+
-            warehouseInventory.setCreateOrgSid(dto.getCreateOrgSid());
-            warehouseInventory.setGoodsSkuOwnSpec(dto2.getSpecValue());
-            warehouseInventory.setGoodsSpuName(dto2.getGoodsSpuName());
-            warehouseInventory.setGoodSpuSid(dto2.getGoodsSpuSid());
-            warehouseInventory.setGoodsTypeSid(dto2.getGoodsTypeSid());
-            warehouseInventory.setGoodsTypeName(dto2.getGoodsTypeName());
-            warehouseInventory.setGoodsBrandName(dto2.getGoodsBrandName());
-            warehouseInventory.setGoodsBrandSid(dto2.getGoodsBrandSid());
-            warehouseInventory.setManufacturerName(dto2.getManufacturerName());
-            warehouseInventory.setManufacturerSid(dto2.getManufacturerSid());
             String billNo1 = dto2.getGoodsSkuCode() + date;
             String b = baseMapper.selectNum(billNo1);
             if (org.apache.commons.lang3.StringUtils.isNotBlank(b)) {
@@ -361,7 +345,18 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
                 billNo1 = Rule.getBillNo(billNo1, 0);
             }
             warehouseInventory.setGoodsID(billNo1);
-            warehouseInventoryService.save(warehouseInventory);
+            warehouseInventory.setBusTypeKey("验货入库");
+            warehouseInventory.setBusTypeValue("验货入库");
+            warehouseInventory.setSourceBillSid(purchaseInventoryBill.getSid());
+            warehouseInventory.setBillNo(purchaseInventoryBill.getBillNo());
+            warehouseInventory.setBillType("1");
+            warehouseInventory.setSupplierName(dto.getSupplierName());
+            warehouseInventory.setSupplierSid(dto.getSupplierSid());
+            warehouseInventory.setUserSid(dto.getUserSid());
+            warehouseInventory.setUserName(dto.getUserName());
+            warehouseInventory.setUseOrgSid(dto.getUseOrgSid());
+            warehouseInventory.setCreateOrgSid(dto.getCreateOrgSid());
+            warehouseInventoryService.saveInventory(warehouseInventory);
         }
         OperationRecordDto dto1 = new OperationRecordDto();
         dto1.setBillSid(sid);

src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java

@@ -63,7 +63,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
     WarehouseInventoryRecordService warehouseInventoryRecordService;
 
 //    public void saveOrUpdateDetailsList2(String sid, List<PurchaseInventoryBillDetailDto2> list, List<WarehouseReceiptBillDetailBatchDto2> pcList) {
-    public ResultBean<String> saveOrUpdateDetailsList2(String sid, List<PurchaseInventoryBillDetailDto2> list) {
+    public ResultBean<String> saveOrUpdateDetailsList2(String sid, List<PurchaseInventoryBillDetailDto2> list,String userSid,String userName) {
         ResultBean<String> rb = ResultBean.fireFail();
         baseMapper.deleteByBillSid(sid);
         PurchaseInventoryBill p=purchaseInventoryBillService.getOne(new QueryWrapper<PurchaseInventoryBill>().eq("sid",sid));
@@ -115,12 +115,10 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
             warehouseInventory.setBusTypeValue("采购入库");
             warehouseInventory.setSourceBillNo(p.getSid());
             warehouseInventory.setSourceBillSid(p.getBillNo());
-            warehouseInventory.setGoodsTypeSid(warehouseAnsBillDetail.getGoodsTypeSid());
+            warehouseInventory.setUseOrgSid(p.getUseOrgSid());
-            warehouseInventory.setGoodsTypeName(warehouseAnsBillDetail.getGoodsTypeName());
+            warehouseInventory.setCreateOrgSid(p.getCreateOrgSid());
-            warehouseInventory.setGoodsBrandName(warehouseAnsBillDetail.getGoodsBrandName());
+            warehouseInventory.setUserSid(userSid);
-            warehouseInventory.setGoodsBrandSid(warehouseAnsBillDetail.getGoodsBrandSid());
+            warehouseInventory.setUserName(userName);
-            warehouseInventory.setManufacturerName(warehouseAnsBillDetail.getManufacturerName());
-            warehouseInventory.setManufacturerSid(warehouseAnsBillDetail.getManufacturerSid());
             warehouseInventoryService.saveInventory(warehouseInventory);
             baseMapper.insert(purchaseInventoryBillDetail);
         }

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java

@@ -3,6 +3,8 @@ package com.yxt.warehouse.biz.warehouseansbilldetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -27,11 +29,11 @@ public class WarehouseAnsListDetailsVo {
     @ApiModelProperty("计量单位")
     private String unit;
     @ApiModelProperty("预约数量（采购订单数量）")
-    private double orderCount;
+    private BigDecimal orderCount=new BigDecimal(0);
     @ApiModelProperty("待入库数量-根据收货单计算")
-    private Integer waitInCount;
+    private BigDecimal waitInCount=new BigDecimal(0);
     @ApiModelProperty("实际入库数量-根据收货单计算")
-    private Integer actualInCount;
+    private BigDecimal actualInCount=new BigDecimal(0);
     private double price;//单价
     private double totalPrice;//总价
     private String batch;//批次

src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml

@@ -36,8 +36,7 @@
     <select id="selectAreaByRackSid" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo">
         select * from warehouse_area a
             left join warehouse_rack b on a.sid =b.locationSid
-                 where b.locationSid=#{areaSid}
+                 where b.sid=#{areaSid}
-
     </select>
     <update id="updateBySidIsDelete">
         UPDATE warehouse_area

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java

@@ -25,7 +25,7 @@ public class WarehouseInventory extends BaseEntity {
     @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）")
     private String goodsID;
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java

@@ -24,7 +24,7 @@ public class WarehouseInventoryDto implements Dto {
     @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）")
     private String goodsID;
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java

@@ -19,7 +19,7 @@ public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory>
 
     IPage<WarehouseInventoryVo> listPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
     IPage<WarehouseInventoryVo> listPage1(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
-    List<WarehouseInventoryVo> getListBySpuSid(@Param("spuSid")String spuSid);
+    List<WarehouseInventoryVo> getListBySpuSid(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
     List<WarehouseInventoryVo> getListBySpuSid1(@Param("spuSid")String spuSid);
     List<WarehouseInventoryRackVo> getRackCountBySid(@Param("sid")String sid,@Param("orgSid") String orgSid);
     List<WarehouseInventoryRackVo> getRackCountBySid1(@Param("sid")String sid,@Param("orgSid") String orgSid);

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml

@@ -20,6 +20,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        group by a.goodsSpuSid
     </select>
     <select id="listPage1" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
         select
@@ -29,16 +30,13 @@
         sum(a.count) as count ,
         sum(a.allocateCount) as allocateCount,
         sum(a.count-a.allocateCount) as useCount,
-        sum(a.freezeCount) as freezeCount,
+        sum(a.freezeCount) as freezeCount
-        a.warehouseName,
-        a.warehouseRackCode,
-        a.warehouseRackSid,
-        a.goodsTypeName as typeName
         from warehouse_inventory a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
+        group by a.goodsSpuSid
     </select>
     <select id="getListBySpuSid" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
         select
@@ -58,10 +56,12 @@
         sum(a.freezeCount) as freezeCount,
         a.batchNumber,
         a.goodsTypeName as typeName,
-        a.goodsBrandName as brandName
+        a.goodsBrandName as brandName,
+        a.warehouseRackSid
         from warehouse_inventory a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            a.goodsSpuSid=#{spuSid}
+            ${ew.sqlSegment}
         </where>
         group by a.goodsSkuSid
     </select>
@@ -422,7 +422,7 @@
             goodsTypeName,
             goodsBrandSid,
             goodsBrandName,
-            goodSpuSid,
+            goodsSpuSid,
             goodsSpuName,
             goodsSkuSid,
             goodsSkuTitle,

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java

@@ -42,10 +42,11 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     WarehouseInventoryBatchService warehouseInventoryBatchService;
     @Autowired
     WarehouseAreaService warehouseAreaService;
-    public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(PagerQuery<WarehouseInventoryQuery> pq) {
+
-        ResultBean rb =new ResultBean().fail();
+    public QueryWrapper<WarehouseInventory> createQueryWrapper(PagerQuery<WarehouseInventoryQuery> pq){
         WarehouseInventoryQuery query = pq.getParams();
         QueryWrapper<WarehouseInventory> qw = new QueryWrapper<>();
+        qw.clear();
         if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
             //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
             String orgLevelKey=query.getOrgLevelKey();
@@ -62,13 +63,7 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
                 qw.apply("s.orgSidPath like('"+orgSidPath+"')");
             } else if ("4".equals(orgLevelKey)) {
                 qw.eq("wab.createBySid", query.getUserSid());
-            } else {
-                PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
-                return rb.success().setData(p);
             }
-        } else {
-            PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
-            return rb.success().setData(p);
         }
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("a.warehouseSid", query.getWarehouseSid());
@@ -82,30 +77,43 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         if (StringUtils.isNotBlank(query.getSpec())) {
             qw.like("a.goodsSkuOwnSpec", query.getSpec());
         }
-        if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
-            qw.eq("a.goodsSpuSid", query.getGoodsSpuSid());
-        }
         qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()).
                 apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd()
                 );
         qw.eq("1",1);
-        qw.groupBy("a.goodsSpuSid");
+        return qw;
+    }
+
+    public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(PagerQuery<WarehouseInventoryQuery> pq) {
+        ResultBean rb =new ResultBean().fail();
+        WarehouseInventoryQuery query = pq.getParams();
+        QueryWrapper<WarehouseInventory> qw=new QueryWrapper<>();
+        if(StringUtils.isBlank(query.getOrgLevelKey())){
+            PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
+            return rb.success().setData(p);
+        }else{
+            qw = createQueryWrapper(pq);
+        }
         IPage<WarehouseInventory> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseInventoryVo> pagging = baseMapper.listPage(page, qw);
         for (WarehouseInventoryVo record : pagging.getRecords()) {
-            List<WarehouseInventoryVo> vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid());
+            List<WarehouseInventoryVo> vos=new ArrayList<>();
-            WarehouseAnsListDetailsVo vo2=warehouseAnsBillDetailService.selCountBySpuSid(record.getGoodsSpuSid());
+            if (StringUtils.isBlank(query.getGoodsSpuSid())) {
-            record.setProcurementInTransit(new BigDecimal(vo2.getWaitInCount()));
+                qw=createQueryWrapper(pq);
-            record.setInTransitSummary(record.getInTransitSummary()
+                qw.eq("a.goodsSpuSid", record.getGoodsSpuSid());
-                    .add(record.getProcurementInTransit())
+                vos=baseMapper.getListBySpuSid(qw);
-                    .add(record.getSalesReturnInTransit())
+            }else{
-                    .add(record.getTransferInTransit())
+                vos=baseMapper.getListBySpuSid(qw);
-                    .add(record.getOtherOnTheWay())
+            }
-                    .add(record.getWorkOrderInTransit()));
             for (WarehouseInventoryVo vo : vos) {
                 vo.setMainSid(record.getGoodsSpuSid());
                 WarehouseAnsListDetailsVo vo1=warehouseAnsBillDetailService.selCountBySkuSid(vo.getGoodsSkuSid());
-                vo.setProcurementInTransit(new BigDecimal(vo1.getWaitInCount()));
+                BigDecimal w=new BigDecimal(0);
+                if(vo1!=null){
+                    w=vo1.getWaitInCount();
+                }
+                vo.setProcurementInTransit(w);
+                record.setProcurementInTransit(record.getProcurementInTransit().add(vo.getProcurementInTransit()));
                 vo.setInTransitSummary(vo.getInTransitSummary()
                         .add(vo.getProcurementInTransit())
                         .add(vo.getSalesReturnInTransit())
@@ -113,6 +121,12 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
                         .add(vo.getOtherOnTheWay())
                         .add(vo.getWorkOrderInTransit()));
             }
+            record.setInTransitSummary(record.getInTransitSummary()
+                    .add(record.getProcurementInTransit())
+                    .add(record.getSalesReturnInTransit())
+                    .add(record.getTransferInTransit())
+                    .add(record.getOtherOnTheWay())
+                    .add(record.getWorkOrderInTransit()));
             record.setChildren(vos);
         }
         PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null);
@@ -122,59 +136,28 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         ResultBean rb =new ResultBean().fail();
         WarehouseInventoryQuery query = pq.getParams();
         QueryWrapper<WarehouseInventory> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
+        if(StringUtils.isBlank(query.getOrgLevelKey())){
-            //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
-            String orgLevelKey=query.getOrgLevelKey();
-            String orgSidPath=query.getOrgPath();
-            int index=query.getIndex();
-            if ("1".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, index);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, index);
-                qw.like("s.orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, index);
-                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
-            } else if ("4".equals(orgLevelKey)) {
-                qw.eq("wab.createBySid", query.getUserSid());
-            } else {
             PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
             return rb.success().setData(p);
+        }else{
+            qw = createQueryWrapper(pq);
         }
-        } else {
-            PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
-            return rb.success().setData(p);
-        }
-        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
-            qw.eq("a.warehouseNameSid", query.getWarehouseSid());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
-            qw.eq("a.goodsSpuSid", query.getGoodsSpuSid());
-        }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
-            qw.eq("a.goodsBrandSid", query.getBrandSid());
-        }
-        if (StringUtils.isNotBlank(query.getSpec())) {
-            qw.like("a.goodsSkuOwnSpec", query.getSpec());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
-            qw.like("a.goodsSpuSid", query.getGoodsSpuSid());
-        }
-        qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()).
-                apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd()
-                );
-        qw.eq("1",1);
-        qw.groupBy("a.goodsSpuSid");
         IPage<WarehouseInventory> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseInventoryVo> pagging = baseMapper.listPage1(page, qw);
         for (WarehouseInventoryVo record : pagging.getRecords()) {
-            WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(record.getWarehouseRackSid());
+            List<WarehouseInventoryVo> vos=new ArrayList<>();
-            List<WarehouseInventoryVo> vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid());
+            if (StringUtils.isBlank(query.getGoodsSpuSid())) {
-            for (WarehouseInventoryVo vo : vos) {
+                qw=createQueryWrapper(pq);
-                vo.setMainSid(record.getGoodsSpuSid());
+                qw.eq("a.goodsSpuSid", record.getGoodsSpuSid());
+                vos=baseMapper.getListBySpuSid(qw);
+            }else{
+                vos=baseMapper.getListBySpuSid(qw);
+            }
+            for (WarehouseInventoryVo vo : vos) {
+                WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(vo.getWarehouseRackSid());
+                vo.setMainSid(record.getGoodsSpuSid());
+                vo.setWarehouseAreaName(vo1.getAreaName());
             }
-            record.setWarehouseAreaName(vo1.getAreaName());
             record.setChildren(vos);
         }
         PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null);
@@ -186,8 +169,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         ResultBean rb = ResultBean.fireFail();
         WarehouseInventory warehouseInventory=new WarehouseInventory();
         BeanUtil.copyProperties(dto,warehouseInventory);
+        warehouseInventory.setSid(UUID.randomUUID().toString());
         baseMapper.insert(warehouseInventory);
-
         WarehouseInventoryRecordDto recordDto=new WarehouseInventoryRecordDto();
         BeanUtil.copyProperties(dto,recordDto);
         recordDto.setInventorySid(warehouseInventory.getSid());
@@ -196,7 +179,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         recordDto.setBusTypeValue(dto.getBusTypeValue());
         recordDto.setBillObjSid(dto.getSupplierSid());
         recordDto.setBillObjName(dto.getSupplierSid());
-        recordDto.setCurrentCount(dto.getCount());
+        String v=selInventoryCountBySkuSid(dto.getGoodsSkuSid());
+        recordDto.setCurrentCount(new BigDecimal(v));
         recordDto.setOperator(dto.getUserName());
         recordDto.setOperatorSid(dto.getUserSid());
         warehouseInventoryRecordService.saveRecord(recordDto);

src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistory.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @date 2024/2/28 8:38
  */
 @Data
-@TableName("warehouse_inventory")
+@TableName("warehouse_inventory_history")
 public class WarehouseInventoryHistory extends BaseEntity {
 
     @ApiModelProperty("批次号")
@@ -33,7 +33,7 @@ public class WarehouseInventoryHistory extends BaseEntity {
     @ApiModelProperty("品牌名")
     private String goodsBrandName;
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")

src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java

@@ -32,34 +32,37 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou
     WarehouseInventoryService warehouseInventoryService;
     @Autowired
     WarehouseInventoryHistoryService warehouseInventoryHistoryService;
+    public QueryWrapper<WarehouseInventoryHistory> createQueryWrapper(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
+        return new QueryWrapper<>();
+    }
     public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
         ResultBean rb =new ResultBean().fail();
         WarehouseInventoryHistoryQuery query = pq.getParams();
         QueryWrapper<WarehouseInventoryHistory> qw = new QueryWrapper<>();
-//        if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
+        if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
-//            //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
+            //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
-//            String orgLevelKey=query.getOrgLevelKey();
+            String orgLevelKey=query.getOrgLevelKey();
-//            String orgSidPath=query.getOrgPath();
+            String orgSidPath=query.getOrgPath();
-//            int index=query.getIndex();
+            int index=query.getIndex();
-//            if ("1".equals(orgLevelKey)) {
+            if ("1".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, index);
+                orgSidPath = orgSidPath.substring(0, index);
-//                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
-//            } else if ("2".equals(orgLevelKey)) {
+            } else if ("2".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, index);
+                orgSidPath = orgSidPath.substring(0, index);
-//                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("s.orgSidPath", orgSidPath);
-//            } else if ("3".equals(orgLevelKey)) {
+            } else if ("3".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, index);
+                orgSidPath = orgSidPath.substring(0, index);
-//                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
+                qw.apply("s.orgSidPath like('"+orgSidPath+"')");
-//            } else if ("4".equals(orgLevelKey)) {
+            } else if ("4".equals(orgLevelKey)) {
-//                qw.eq("wab.createBySid", query.getUserSid());
+                qw.eq("wab.createBySid", query.getUserSid());
-//            } else {
+            } else {
-//                PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
+                PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
-//                return rb.success().setData(p);
+                return rb.success().setData(p);
-//            }
+            }
-//        } else {
+        } else {
-//            PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
+            PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
-//            return rb.success().setData(p);
+            return rb.success().setData(p);
-//        }
+        }
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.like("a.warehouseNameSid", query.getWarehouseSid());
         }
@@ -96,6 +99,9 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou
         List<WarehouseInventoryHistory> warehouseInventoryHistories=new ArrayList<>();
         for (WarehouseInventory warehouseOrg : warehouseOrgs) {
             List<WarehouseInventoryHistory> warehouseInventoryHistories1=warehouseInventoryService.totalInventoryByOrgSid(warehouseOrg.getUseOrgSid());
+            for (WarehouseInventoryHistory warehouseInventoryHistory : warehouseInventoryHistories1) {
+                warehouseInventoryHistory.setOrderDate(new Date());
+            }
             warehouseInventoryHistories.addAll(warehouseInventoryHistories1);
         }
         if(warehouseInventoryHistories.size()!=0){

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java

@@ -73,7 +73,7 @@ public class WarehouseInventoryRecord extends BaseEntity {
 	@ApiModelProperty("批次号")
     private String batchNumber; // 批次号
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java

@@ -73,7 +73,7 @@ public class WarehouseInventoryRecordDto implements Dto {
     @ApiModelProperty("批次号")
     private String batchNumber; // 批次号
     @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
     @ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
     @ApiModelProperty("商品Skusid")

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java

@@ -29,15 +29,16 @@ public class WarehouseInventoryRecordListVo {
     @ApiModelProperty("操作员")
     private String operator;
     @ApiModelProperty("单价")
-    private BigDecimal price;
+    private BigDecimal cost;
     @ApiModelProperty("spuname")
     private String goodsSpuName;
     @ApiModelProperty("skutitle")
-    private String goodsTitle;
+    private String goodsSkuTitle;
     @ApiModelProperty("规格型号")
     private String goodsSkuOwnSpec;
     @ApiModelProperty("发生成本")
     private BigDecimal costIncurred=new BigDecimal(0);
     @ApiModelProperty("库存成本")
     private BigDecimal inventoryCost=new BigDecimal(0);
+    private String warehouseName;
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml

@@ -178,8 +178,8 @@
                    when 0 then '出库'
                    when 1 then '入库'
                 end as billTypeValue,
-            a.price * a.count as costIncurred,
+            a.cost * a.count as costIncurred,
-            a.price * a.currentCount as inventoryCost
+            a.cost * a.currentCount as inventoryCost
         from warehouse_inventory_record a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
             <where>

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java

@@ -250,7 +250,7 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
             qw.like("a.busTypeValue", query.getBillType());
         }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("a.goodsSpuName", query.getGoodsSpuName());
+            qw.like("a.goodsSkuTitle", query.getGoodsSpuName());
         }
         if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) {
             qw.like("a.warehouseName", query.getWarehouseName());
@@ -264,9 +264,9 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
 //        qw.eq("sourceBillSid",query.getBillSid());
         IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
         if(query.getType().equals("1")){
-            qw.eq("a.goodSpuSid",query.getSid());
+            qw.eq("a.goodsSpuSid",query.getSid());
         }else if(query.getType().equals("2")){
-            qw.eq("a.goodSkuSid",query.getSid());
+            qw.eq("a.goodsSkuSid",query.getSid());
         }
         IPage<WarehouseInventoryRecordListVo> pagging = baseMapper.getWarehouseInventoryRecord(page, qw);
         PagerVo<WarehouseInventoryRecordListVo> p = PagerUtil.pageToVo(pagging, null);

src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java

@@ -370,7 +370,7 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
             warehouseInventoryRecordDto.setBillObjName(dto.getBillObjName());
             warehouseInventoryRecordDto.setBillObjSid(dto.getBillObjSid());
             warehouseInventoryRecordDto.setBatchNumber(warehouseInventory.getBatchNumber());
-            warehouseInventoryRecordDto.setGoodSpuSid(warehouseInventory.getGoodSpuSid());
+            warehouseInventoryRecordDto.setGoodsSpuSid(warehouseInventory.getGoodsSpuSid());
             warehouseInventoryRecordDto.setGoodsSpuName(warehouseOutLocation.getGoodsSpuName());
             warehouseInventoryRecordDto.setGoodsSkuSid(warehouseOutLocation.getGoodsSkuSid());
             warehouseInventoryRecordDto.setGoodsSkuCode(warehouseOutLocation.getGoodsSkuCode());

src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java

@@ -149,7 +149,7 @@ public class WarehouseShelfBillService extends MybatisBaseService<WarehouseShelf
                 wmsInventoryRecordDto.setBillNo(wmsShelfBill.getSourceBillNo());
                 wmsInventoryRecordDto.setBillType("1");
                 wmsInventoryRecordDto.setBatchNumber(dto.getBatchNumber());
-                wmsInventoryRecordDto.setGoodSpuSid(dto.getGoodSpuSid());
+                wmsInventoryRecordDto.setGoodsSpuSid(dto.getGoodSpuSid());
                 wmsInventoryRecordDto.setGoodsSpuName(dto.getGoodsSpuName());
                 wmsInventoryRecordDto.setGoodsSkuSid(dto.getGoodsSkuSid());
                 wmsInventoryRecordDto.setGoodsSkuCode(dto.getGoodsSkuCode());