From 9823ffc065034849d292708a5beaecb87be0e756 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 21 Oct 2024 09:04:17 +0800 Subject: [PATCH] 1021 --- .../warehouse/apiadmin/WarehouseInfoRest.java | 2 +- .../InventoryAdjustmentMapper.xml | 6 +- .../InventoryAdjustmentService.java | 4 + .../InventoryAdjustmentDetailMapper.xml | 2 +- .../WarehouseAnsBillDetailMapper.java | 1 + .../WarehouseAnsBillDetailMapper.xml | 11 +++ .../WarehouseAnsBillDetailService.java | 4 + .../WarehouseAnsListDetailsVo.java | 3 +- .../biz/warehouseinfo/ProjectDetailsVo.java | 26 ++++++ .../warehouseinfo/WarehouseInfoMapper.java | 2 +- .../biz/warehouseinfo/WarehouseInfoMapper.xml | 2 +- .../warehouseinfo/WarehouseInfoService.java | 48 +++++++++- .../WarehouseInventoryMapper.java | 2 +- .../WarehouseInventoryMapper.xml | 21 +++-- .../WarehouseInventoryService.java | 20 ++++ .../WarehouseInventoryVo.java | 2 + .../WarehouseInventoryRecordService.java | 2 +- .../com/yxt/warehouse/utils/DoubleUtils.java | 93 +++++++++++++++++++ 18 files changed, 232 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java create mode 100644 src/main/java/com/yxt/warehouse/utils/DoubleUtils.java diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index f289a98..64b8e63 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -34,7 +34,7 @@ public class WarehouseInfoRest { return wmsWarehouseService.listPage(pq); } @PostMapping("/list") - public ResultBean> list(@RequestBody WarehouseInfoMapQuery query) { + public ResultBean> list(@RequestBody WarehouseInfoMapQuery query) { return wmsWarehouseService.listQuery(query); } @ApiOperation("查询所有的仓库") diff --git a/src/main/java/com/yxt/warehouse/biz/inventoryadjustment/InventoryAdjustmentMapper.xml b/src/main/java/com/yxt/warehouse/biz/inventoryadjustment/InventoryAdjustmentMapper.xml index 71423f4..3a798d6 100644 --- a/src/main/java/com/yxt/warehouse/biz/inventoryadjustment/InventoryAdjustmentMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/inventoryadjustment/InventoryAdjustmentMapper.xml @@ -31,13 +31,13 @@ where a.sid =#{sid} - - delete inventory_adjustment + + delete from inventory_adjustment where sid in #{item} - + - delete inventory_adjustment_detail + delete from inventory_adjustment_detail where billSid in #{item} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java index 9c43993..4b3c33a 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java @@ -25,4 +25,5 @@ public interface WarehouseAnsBillDetailMapper extends BaseMapper selectByBillSid(String sid); WarehouseAnsListDetailsVo selCountBySkuSid(String sid); WarehouseAnsListDetailsVo selCountBySpuSid(String sid); + WarehouseAnsListDetailsVo selCount(@Param("orgSid") String orgSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml index c4bf37c..c9561bd 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml @@ -39,5 +39,16 @@ from warehouse_ans_bill_detail a where a.goodsSpusid =#{sid} + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java index 0696ec5..ee98637 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java @@ -146,4 +146,8 @@ public class WarehouseAnsBillDetailService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List listQuery( @Param(Constants.WRAPPER) QueryWrapper qw); + List listQuery( @Param(Constants.WRAPPER) QueryWrapper qw); int updateBySidIsDelete(List list); @Select("select * from wms_warehouse_info") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml index 428b97c..884b18d 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml @@ -13,7 +13,7 @@ ${ew.sqlSegment} - select a.* from warehouse_info a diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java index f588b50..40d3d62 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -10,12 +10,21 @@ 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.warehouse.biz.purchaseinventorybill.PurchaseInventoryBill; +import com.yxt.warehouse.biz.purchaseinventorybill.PurchaseInventoryBillService; +import com.yxt.warehouse.biz.purchaseinventorybilldetail.PurchaseInventoryBillDetail; +import com.yxt.warehouse.biz.purchaseinventorybilldetail.PurchaseInventoryBillDetailService; import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventory; +import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryService; +import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecord; +import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordService; import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo; +import com.yxt.warehouse.utils.DoubleUtils; import com.yxt.warehouse.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,6 +46,12 @@ public class WarehouseInfoService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -83,15 +98,42 @@ public class WarehouseInfoService extends MybatisBaseService> listQuery(WarehouseInfoMapQuery query) { + public ResultBean> listQuery(WarehouseInfoMapQuery query) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); qw.like("s.orgSidPath", query.getOrgPath()); if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getName())) { qw.like("a.warehouseName", query.getName()); } - List storeInfos = baseMapper.listQuery(qw); - for (WarehouseInfo storeInfo : storeInfos) { + List storeInfos = baseMapper.listQuery(qw); + for (ProjectDetailsVo storeInfo : storeInfos) { + List warehouseInventories=warehouseInventoryService.list(new QueryWrapper().eq("warehouseSid",storeInfo.getSid())); + if (warehouseInventories.size()!=0){ + List list=warehouseInventoryRecordService.list(new QueryWrapper() + .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1")); + if(list.size()!=0){ + storeInfo.setSupplierName(list.get(0).getBillObjName()); + Listdetails=purchaseInventoryBillDetailService.list(new QueryWrapper() + .eq("sourceBillSid",list.get(0).getSourceBillSid())); + for (PurchaseInventoryBillDetail detail : details) { + if(StringUtils.isBlank(storeInfo.getGoodsDetail())){ + Double s=detail.getCount(); + if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ + storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + }else{ + storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + } + }else{ + Double s=detail.getCount(); + if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ + storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + }else{ + storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + } + } + } + } + } if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){ String []w=storeInfo.getLngAndLat().split(","); storeInfo.setLatitude(w[1]); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java index 3a63770..1651a79 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java @@ -25,7 +25,7 @@ public interface WarehouseInventoryMapper extends BaseMapper List getListBySpuSid1(@Param(Constants.WRAPPER) QueryWrapper qw,@Param("countStart") String countStart,@Param("countEnd") String countEnd); List getRackCountBySid(@Param("sid")String sid,@Param("orgSid") String orgSid); List getRackCountBySid1(@Param("sid")String sid,@Param("orgSid") String orgSid); - + WarehouseInventoryVo selCountByOrgSid(@Param("orgSid") String orgSid); WarehouseInventoryVo initialization(@Param("sid") String sid); int updatePrice1(@Param("price") String price, @Param("list") List stringList); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml index b46fca8..d01fc44 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -9,10 +9,6 @@ a.goodsSpuName, a.goodsSpuSid, a.unit, --- sum(a.count) as count , --- sum(a.allocateCount) as allocateCount, --- sum(a.count-a.allocateCount) as useCount, --- sum(a.freezeCount) as freezeCount, a.batchNumber, a.goodsTypeName as typeName from warehouse_inventory a @@ -52,11 +48,14 @@ left join warehouse_rack b on b.sid =a.warehouseRackSid LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid left join warehouse_area d on d.sid =b.locationSid - LEFT JOIN warehouse_area_warning c ON c.warehouseAreaSid = b.locationSid + LEFT JOIN warehouse_area_warning c ON c.warehouseAreaSid = b.locationSid and c.goodsSpuSid =a.goodsSpuSid ${ew.sqlSegment} - group by a.goodsSpuSid + group by + d.sid, + a.goodsSpuSid + ORDER BY d.sid +