From 19c62e5852d982ea0a4b48cde4b5ba5341409f83 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 20 Nov 2024 16:09:56 +0800 Subject: [PATCH] 11.20 --- .../biz/warehouseinfo/GoodsDetailsVo.java | 14 +++ .../biz/warehouseinfo/ProjectDetailsVo.java | 4 + .../warehouseinfo/WarehouseInfoService.java | 89 +++++++++++-------- 3 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinfo/GoodsDetailsVo.java diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/GoodsDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/GoodsDetailsVo.java new file mode 100644 index 0000000..0bb3626 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/GoodsDetailsVo.java @@ -0,0 +1,14 @@ +package com.yxt.warehouse.biz.warehouseinfo; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/11/8 16:56 + */ +@Data +public class GoodsDetailsVo { + private String goodsDetail; + private String supplierName; + private String supplierType; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java index 505fa62..d1e3273 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java @@ -2,6 +2,9 @@ package com.yxt.warehouse.biz.warehouseinfo; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @author wangpengfei * @date 2024/10/17 15:17 @@ -24,5 +27,6 @@ public class ProjectDetailsVo { private String customerName; private String supplierType; private String goodsDetail; + private List goodsDetails=new ArrayList<>(); private String remarks; } 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 5691ca8..864270c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -122,34 +122,39 @@ public class WarehouseInfoService extends MybatisBaseService getWarehouseBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - ProjectDetailsVo storeInfo = baseMapper.getWarehouseBySid(sid); 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()); + List lists=warehouseInventoryRecordService.list(new QueryWrapper() + .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1").groupBy("billNo")); + List goodsDetails=new ArrayList<>(); + for (WarehouseInventoryRecord list : lists) { + if(list!=null){ + GoodsDetailsVo vo=new GoodsDetailsVo(); + vo.setSupplierName(list.getBillObjSid()); + Listdetails=purchaseInventoryBillDetailService.list(new QueryWrapper() + .eq("sourceBillSid",list.getSourceBillSid())); + for (PurchaseInventoryBillDetail detail : details) { + if(StringUtils.isBlank(vo.getGoodsDetail())){ + Double s=detail.getCount(); + if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ + vo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + }else{ + vo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + } }else{ - storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + Double s=detail.getCount(); + if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ + vo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + }else{ + vo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + } } } + goodsDetails.add(vo); } } + storeInfo.setGoodsDetails(goodsDetails); } if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){ String []w=storeInfo.getLngAndLat().split(","); @@ -189,30 +194,36 @@ public class WarehouseInfoService extends MybatisBaseService 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()); + List lists=warehouseInventoryRecordService.list(new QueryWrapper() + .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1").groupBy("billNo")); + List goodsDetails=new ArrayList<>(); + for (WarehouseInventoryRecord list : lists) { + if(list!=null){ + GoodsDetailsVo vo=new GoodsDetailsVo(); + vo.setSupplierName(list.getBillObjSid()); + Listdetails=purchaseInventoryBillDetailService.list(new QueryWrapper() + .eq("sourceBillSid",list.getSourceBillSid())); + for (PurchaseInventoryBillDetail detail : details) { + if(StringUtils.isBlank(vo.getGoodsDetail())){ + Double s=detail.getCount(); + if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ + vo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + }else{ + vo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + } }else{ - storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + Double s=detail.getCount(); + if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ + vo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + }else{ + vo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); + } } } + goodsDetails.add(vo); } } + storeInfo.setGoodsDetails(goodsDetails); } if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){ String []w=storeInfo.getLngAndLat().split(",");