open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11.20

Browse Source
This commit is contained in:
wangpengfei
2024-11-20 16:09:56 +08:00
parent 2b2a034010
commit 19c62e5852
3 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/yxt/warehouse/biz/warehouseinfo/GoodsDetailsVo.java Normal file
View File

@@ -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;
}

4
src/main/java/com/yxt/warehouse/biz/warehouseinfo/ProjectDetailsVo.java
View File

@@ -2,6 +2,9 @@ package com.yxt.warehouse.biz.warehouseinfo;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/** /**
* @author wangpengfei * @author wangpengfei
* @date 2024/10/17 15:17 * @date 2024/10/17 15:17
@@ -24,5 +27,6 @@ public class ProjectDetailsVo {
private String customerName; private String customerName;
private String supplierType; private String supplierType;
private String goodsDetail; private String goodsDetail;
private List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
private String remarks; private String remarks;
} }

53
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -122,35 +122,40 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
} }
public ResultBean<ProjectDetailsVo> getWarehouseBySid(String sid) { public ResultBean<ProjectDetailsVo> getWarehouseBySid(String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
ProjectDetailsVo storeInfo = baseMapper.getWarehouseBySid(sid); ProjectDetailsVo storeInfo = baseMapper.getWarehouseBySid(sid);
List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid())); List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
if (warehouseInventories.size()!=0){ if (warehouseInventories.size()!=0){
List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>() List<WarehouseInventoryRecord> lists=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
.eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1")); .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1").groupBy("billNo"));
if(list.size()!=0){ List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
storeInfo.setSupplierName(list.get(0).getBillObjName()); for (WarehouseInventoryRecord list : lists) {
if(list!=null){
GoodsDetailsVo vo=new GoodsDetailsVo();
vo.setSupplierName(list.getBillObjSid());
List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>() List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
.eq("sourceBillSid",list.get(0).getSourceBillSid())); .eq("sourceBillSid",list.getSourceBillSid()));
for (PurchaseInventoryBillDetail detail : details) { for (PurchaseInventoryBillDetail detail : details) {
if(StringUtils.isBlank(storeInfo.getGoodsDetail())){ if(StringUtils.isBlank(vo.getGoodsDetail())){
Double s=detail.getCount(); Double s=detail.getCount();
if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}else{ }else{
storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
} }
}else{ }else{
Double s=detail.getCount(); Double s=detail.getCount();
if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}else{ }else{
storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
} }
} }
} }
goodsDetails.add(vo);
} }
} }
storeInfo.setGoodsDetails(goodsDetails);
}
if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){ if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
String []w=storeInfo.getLngAndLat().split(","); String []w=storeInfo.getLngAndLat().split(",");
storeInfo.setLatitude(w[1]); storeInfo.setLatitude(w[1]);
@@ -189,31 +194,37 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
for (ProjectDetailsVo storeInfo : pagging.getRecords()) { for (ProjectDetailsVo storeInfo : pagging.getRecords()) {
List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid())); List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
if (warehouseInventories.size()!=0){ if (warehouseInventories.size()!=0){
List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>() List<WarehouseInventoryRecord> lists=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
.eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1")); .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1").groupBy("billNo"));
if(list.size()!=0){ List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
storeInfo.setSupplierName(list.get(0).getBillObjName()); for (WarehouseInventoryRecord list : lists) {
if(list!=null){
GoodsDetailsVo vo=new GoodsDetailsVo();
vo.setSupplierName(list.getBillObjSid());
List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>() List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
.eq("sourceBillSid",list.get(0).getSourceBillSid())); .eq("sourceBillSid",list.getSourceBillSid()));
for (PurchaseInventoryBillDetail detail : details) { for (PurchaseInventoryBillDetail detail : details) {
if(StringUtils.isBlank(storeInfo.getGoodsDetail())){ if(StringUtils.isBlank(vo.getGoodsDetail())){
Double s=detail.getCount(); Double s=detail.getCount();
if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}else{ }else{
storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
} }
}else{ }else{
Double s=detail.getCount(); Double s=detail.getCount();
if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){ if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
}else{ }else{
storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit()); vo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
} }
} }
} }
goodsDetails.add(vo);
} }
} }
storeInfo.setGoodsDetails(goodsDetails);
}
if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){ if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
String []w=storeInfo.getLngAndLat().split(","); String []w=storeInfo.getLngAndLat().split(",");
storeInfo.setLatitude(w[1]); storeInfo.setLatitude(w[1]);