|
|
|
@ -67,18 +67,18 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
@Resource |
|
|
|
private EnterpriseInformationFeign enterpriseInformationFeign; |
|
|
|
|
|
|
|
public ResultBean save(InventoryIndex inventoryIndex){ |
|
|
|
public ResultBean save(InventoryIndex inventoryIndex) { |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
DecimalFormat df = new DecimalFormat("#0.0000"); |
|
|
|
Date date = new Date(); |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BaseResponse<BaseResponseListObj<com.yxt.supervise.gf.shanhai.resp.Inventory>> api$system$inventory$index = ShRequester.getApi$system$inventory$index(inventoryIndex); |
|
|
|
List<com.yxt.supervise.gf.shanhai.resp.Inventory> list = api$system$inventory$index.getData().getList(); |
|
|
|
baseMapper.delete(new QueryWrapper<Inventory>().eq("time",sdf.format(date))); |
|
|
|
pushInventoryDataService.remove(new QueryWrapper<PushInventoryData>().eq("time",sdf.format(date))); |
|
|
|
baseMapper.delete(new QueryWrapper<Inventory>().eq("time", sdf.format(date))); |
|
|
|
pushInventoryDataService.remove(new QueryWrapper<PushInventoryData>().eq("time", sdf.format(date))); |
|
|
|
for (com.yxt.supervise.gf.shanhai.resp.Inventory inventory : list) { |
|
|
|
Inventory inventory1 = new Inventory(); |
|
|
|
BeanUtil.copyProperties(inventory,inventory1); |
|
|
|
BeanUtil.copyProperties(inventory, inventory1); |
|
|
|
inventory1.setTime(sdf.format(date)); |
|
|
|
baseMapper.insert(inventory1); |
|
|
|
} |
|
|
|
@ -93,25 +93,25 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
if (key.equals("江西余干库") || key.equals("庄河荣名库") || key.equals("安阳荣名库") || key.equals("藁城荣名库") || key.equals("曲阜荣名库")) { |
|
|
|
List<com.yxt.supervise.gf.shanhai.resp.Inventory> value = stringListEntry.getValue(); |
|
|
|
filterValue = value.stream().filter(t -> t.getMateriel_group_text().equals("组件") || t.getMateriel_group_text().equals("逆变器")).collect(Collectors.toList()); |
|
|
|
if (filterValue.size() != 0){ |
|
|
|
map.put(stringListEntry.getKey(),filterValue); |
|
|
|
if (filterValue.size() != 0) { |
|
|
|
map.put(stringListEntry.getKey(), filterValue); |
|
|
|
for (com.yxt.supervise.gf.shanhai.resp.Inventory inventory : filterValue) { |
|
|
|
PushInventoryData pushInventoryData = new PushInventoryData(); |
|
|
|
BeanUtil.copyProperties(inventory,pushInventoryData,"id"); |
|
|
|
BeanUtil.copyProperties(inventory, pushInventoryData, "id"); |
|
|
|
pushInventoryData.setTime(sdf.format(date)); |
|
|
|
pushInventoryDataService.save(pushInventoryData); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//汇总数据添加仓库sid 用作传输数据到仓库中
|
|
|
|
if (filterValue != null){ |
|
|
|
if (filterValue != null) { |
|
|
|
PagerQuery<ShStorehouseQuery> sq = new PagerQuery<>(); |
|
|
|
ShStorehouseQuery shStorehouseQuery = new ShStorehouseQuery(); |
|
|
|
shStorehouseQuery.setName(key); |
|
|
|
sq.setParams(shStorehouseQuery); |
|
|
|
ResultBean resultBean = shStorehouseFeign.listPage(sq); |
|
|
|
LinkedHashMap<String, Object> records = (LinkedHashMap<String, Object>)resultBean.getData(); |
|
|
|
List<LinkedHashMap<String, Object>> data = (ArrayList<LinkedHashMap<String, Object>>)records.get("records"); |
|
|
|
LinkedHashMap<String, Object> records = (LinkedHashMap<String, Object>) resultBean.getData(); |
|
|
|
List<LinkedHashMap<String, Object>> data = (ArrayList<LinkedHashMap<String, Object>>) records.get("records"); |
|
|
|
//查询该企业信息
|
|
|
|
PagerQuery<EnterpriseInformationQuery> sw = new PagerQuery<>(); |
|
|
|
EnterpriseInformationQuery enterpriseInformationQuery = new EnterpriseInformationQuery(); |
|
|
|
@ -374,12 +374,12 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
// fileOut.close();
|
|
|
|
// }
|
|
|
|
|
|
|
|
public PagerVo<InventoryVo> listPage(PagerQuery<InventoryQuery> pq){ |
|
|
|
public PagerVo<InventoryVo> listPage(PagerQuery<InventoryQuery> pq) { |
|
|
|
InventoryQuery params = pq.getParams(); |
|
|
|
QueryWrapper<Inventory> wq = new QueryWrapper<>(); |
|
|
|
if (params != null){ |
|
|
|
if (params != null) { |
|
|
|
if (params.getStorehouse_name() != null || !params.getStorehouse_name().equals("")) |
|
|
|
wq.eq("storehouse_name",params.getStorehouse_name()); |
|
|
|
wq.eq("storehouse_name", params.getStorehouse_name()); |
|
|
|
} |
|
|
|
IPage<Inventory> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<InventoryVo> inventoryVoIPage = baseMapper.selectPageVo(page, wq); |
|
|
|
@ -387,7 +387,7 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
public void export(String storehouse_name, HttpServletResponse response) throws Exception{ |
|
|
|
public void export(String storehouse_name, HttpServletResponse response) throws Exception { |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
Date date = new Date(); |
|
|
|
OutputStream out = response.getOutputStream(); |
|
|
|
@ -398,11 +398,11 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
// 下载文件能正常显示中文
|
|
|
|
response.setHeader( |
|
|
|
"Content-Disposition", |
|
|
|
"attachment;filename=" + URLEncoder.encode(storehouse_name + sdf.format(date)+".xlsx", "UTF-8"));//导出的Excel文件名称
|
|
|
|
"attachment;filename=" + URLEncoder.encode(storehouse_name + sdf.format(date) + ".xlsx", "UTF-8"));//导出的Excel文件名称
|
|
|
|
// response.setHeader("Access-Control-Expose-Headers", "FileName");
|
|
|
|
List<Inventory> inventories = baseMapper.selectInventoryByStorehouseName(storehouse_name);//数据查询--需要导出的数据
|
|
|
|
//行标题设置
|
|
|
|
String[] headList = {"序号","仓库名称", "物料组", "物料编号", "物料名称", "物料品牌", "物料单价", "库存数量", "货值"}; |
|
|
|
String[] headList = {"序号", "仓库名称", "物料组", "物料编号", "物料名称", "物料品牌", "物料单价", "库存数量", "货值"}; |
|
|
|
/*Excel文件创建完毕*/ |
|
|
|
CreationHelper createHelper = wb.getCreationHelper(); //创建帮助工具
|
|
|
|
/*创建表单*/ |
|
|
|
@ -432,10 +432,10 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
cellStyle.setFont(head); |
|
|
|
cellStyle.setAlignment(HorizontalAlignment.CENTER); //设置水平对齐方式
|
|
|
|
cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); //设置垂直对齐方式
|
|
|
|
CellRangeAddress callRangeAddress = new CellRangeAddress(0,0,0,headList.length-1); |
|
|
|
CellRangeAddress callRangeAddress = new CellRangeAddress(0, 0, 0, headList.length - 1); |
|
|
|
Cell cell1 = headRow.createCell(0); |
|
|
|
cell1.setCellStyle(cellStyle); |
|
|
|
cell1.setCellValue(storehouse_name + "("+ sdf.format(date) +")"); |
|
|
|
cell1.setCellValue(storehouse_name + "(" + sdf.format(date) + ")"); |
|
|
|
sheet.addMergedRegion(callRangeAddress); |
|
|
|
Row headRow2 = sheet.createRow(1); |
|
|
|
for (int i = 0; i < headList.length; i++) { //遍历表头数据
|
|
|
|
@ -453,33 +453,33 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
cell.setCellValue(createHelper.createRichTextString(String.valueOf(a++))); |
|
|
|
cell = row.createCell(1); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getStorehouse_name()==null?"":inventories.get(j).getStorehouse_name())); |
|
|
|
.getStorehouse_name() == null ? "" : inventories.get(j).getStorehouse_name())); |
|
|
|
cell = row.createCell(2); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getMateriel_group_text()==null?"":inventories.get(j).getMateriel_group_text())); |
|
|
|
.getMateriel_group_text() == null ? "" : inventories.get(j).getMateriel_group_text())); |
|
|
|
cell = row.createCell(3); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getMateriel_no()==null?"":inventories.get(j).getMateriel_no())); |
|
|
|
.getMateriel_no() == null ? "" : inventories.get(j).getMateriel_no())); |
|
|
|
cell = row.createCell(4); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getMateriel_name()==null?"":inventories.get(j).getMateriel_name())); |
|
|
|
.getMateriel_name() == null ? "" : inventories.get(j).getMateriel_name())); |
|
|
|
cell = row.createCell(5); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getBrand_name() == null?"":inventories.get(j).getBrand_name())); |
|
|
|
.getBrand_name() == null ? "" : inventories.get(j).getBrand_name())); |
|
|
|
cell = row.createCell(6); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getPrice()==null?"":inventories.get(j).getPrice().toString())); |
|
|
|
.getPrice() == null ? "" : inventories.get(j).getPrice().toString())); |
|
|
|
cell = row.createCell(7); |
|
|
|
cell.setCellValue(createHelper.createRichTextString(inventories.get(j) |
|
|
|
.getNum()==null?"":inventories.get(j).getNum().toString())); |
|
|
|
.getNum() == null ? "" : inventories.get(j).getNum().toString())); |
|
|
|
cell = row.createCell(8); |
|
|
|
Double v = inventories.get(j).getPrice() * inventories.get(j).getNum(); |
|
|
|
count+=v; |
|
|
|
cell.setCellValue(createHelper.createRichTextString(v == null ? "":v.toString())); |
|
|
|
count += v; |
|
|
|
cell.setCellValue(createHelper.createRichTextString(v == null ? "" : v.toString())); |
|
|
|
} |
|
|
|
|
|
|
|
//创建合计
|
|
|
|
Row row = sheet.createRow(inventories.size()+2); |
|
|
|
Row row = sheet.createRow(inventories.size() + 2); |
|
|
|
Cell cell = row.createCell(0); |
|
|
|
cell.setCellStyle(dataStyle); |
|
|
|
cell.setCellValue(createHelper.createRichTextString("合计")); |
|
|
|
@ -491,119 +491,123 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
sheet.autoSizeColumn(i); |
|
|
|
} |
|
|
|
wb.write(out); //将workbook写入文件流
|
|
|
|
}catch (Exception e){ |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
}finally { |
|
|
|
} finally { |
|
|
|
wb.close(); |
|
|
|
out.close(); |
|
|
|
} |
|
|
|
} |
|
|
|
public List<InventoryVo> getDayReport(InventoryQuery pq){ |
|
|
|
|
|
|
|
public List<InventoryVo> getDayReport(InventoryQuery pq) { |
|
|
|
InventoryQuery params = pq; |
|
|
|
QueryWrapper<Inventory> wq = new QueryWrapper<>(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
if (params != null){ |
|
|
|
if (params != null) { |
|
|
|
if (StringUtils.isNotBlank(params.getStorehouse_name())) |
|
|
|
wq.eq("storehouse_name",params.getStorehouse_name()); |
|
|
|
wq.eq("storehouse_name", params.getStorehouse_name()); |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())){ |
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())) { |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
|
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
params.setStartDate(sdf.format(DateUtil.yesterday())); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())){ |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
}else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())) { |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6))); |
|
|
|
; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getBrand_name())){ |
|
|
|
wq.eq("brand_name",params.getBrand_name()); |
|
|
|
if (StringUtils.isNotBlank(params.getBrand_name())) { |
|
|
|
wq.eq("brand_name", params.getBrand_name()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getMateriel_group())){ |
|
|
|
wq.in("materiel_group",params.getMateriel_group()); |
|
|
|
}else{ |
|
|
|
wq.in("materiel_group","1","2"); |
|
|
|
if (StringUtils.isNotBlank(params.getMateriel_group())) { |
|
|
|
wq.in("materiel_group", params.getMateriel_group()); |
|
|
|
} else { |
|
|
|
wq.in("materiel_group", "1", "2"); |
|
|
|
} |
|
|
|
} |
|
|
|
List<InventoryVo> inventoryVos = baseMapper.getInventoryByTime(wq); |
|
|
|
|
|
|
|
List<InventoryVo> b=new ArrayList<>(); |
|
|
|
List<InventoryVo> b = new ArrayList<>(); |
|
|
|
//6
|
|
|
|
long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for(int k=0;k<i+1;k++){ |
|
|
|
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()),-k)); |
|
|
|
long i = DateUtil.between(DateUtil.parse(params.getStartDate()), DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for (int k = 0; k < i + 1; k++) { |
|
|
|
String date = sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()), -k)); |
|
|
|
b.add(new InventoryVo()); |
|
|
|
for(InventoryVo vo:inventoryVos){ |
|
|
|
if(vo.getTime().equals(date)){ |
|
|
|
b.set(k,vo); |
|
|
|
for (InventoryVo vo : inventoryVos) { |
|
|
|
if (vo.getTime().equals(date)) { |
|
|
|
b.set(k, vo); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return b; |
|
|
|
} |
|
|
|
public Map<String,Object> getDayReportMap(InventoryQuery pq){ |
|
|
|
|
|
|
|
public Map<String, Object> getDayReportMap(InventoryQuery pq) { |
|
|
|
InventoryQuery params = pq; |
|
|
|
Map<String,Object> m=new HashMap<>(); |
|
|
|
Map<String, Object> m = new HashMap<>(); |
|
|
|
QueryWrapper<Inventory> wq = new QueryWrapper<>(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
if (params != null){ |
|
|
|
if (params != null) { |
|
|
|
if (StringUtils.isNotBlank(params.getStorehouse_name())) |
|
|
|
wq.eq("storehouse_name",params.getStorehouse_name()); |
|
|
|
wq.eq("storehouse_name", params.getStorehouse_name()); |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())){ |
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())) { |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
|
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
params.setStartDate(sdf.format(DateUtil.yesterday())); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())){ |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
}else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())) { |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6))); |
|
|
|
; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getBrand_name())){ |
|
|
|
wq.eq("brand_name",params.getBrand_name()); |
|
|
|
if (StringUtils.isNotBlank(params.getBrand_name())) { |
|
|
|
wq.eq("brand_name", params.getBrand_name()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getMateriel_group())){ |
|
|
|
wq.in("materiel_group",params.getMateriel_group()); |
|
|
|
}else{ |
|
|
|
wq.in("materiel_group","1","2"); |
|
|
|
if (StringUtils.isNotBlank(params.getMateriel_group())) { |
|
|
|
wq.in("materiel_group", params.getMateriel_group()); |
|
|
|
} else { |
|
|
|
wq.in("materiel_group", "1", "2"); |
|
|
|
} |
|
|
|
} |
|
|
|
List<InventoryVo> inventoryVos = baseMapper.getInventoryByTime(wq); |
|
|
|
List<String> a=new ArrayList<>(); |
|
|
|
List<String> b=new ArrayList<>(); |
|
|
|
List<String> a = new ArrayList<>(); |
|
|
|
List<String> b = new ArrayList<>(); |
|
|
|
//6
|
|
|
|
long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for(int k=0;k<i+1;k++){ |
|
|
|
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()),-k)); |
|
|
|
long i = DateUtil.between(DateUtil.parse(params.getStartDate()), DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for (int k = 0; k < i + 1; k++) { |
|
|
|
String date = sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()), -k)); |
|
|
|
a.add(date); |
|
|
|
b.add("0"); |
|
|
|
for(InventoryVo vo:inventoryVos){ |
|
|
|
if(vo.getTime().equals(date)){ |
|
|
|
b.set(k,String.valueOf(vo.getAmount_money())); |
|
|
|
for (InventoryVo vo : inventoryVos) { |
|
|
|
if (vo.getTime().equals(date)) { |
|
|
|
b.set(k, String.valueOf(vo.getAmount_money())); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
m.put("date",a.toArray()); |
|
|
|
m.put("count",b.toArray()); |
|
|
|
m.put("date", a.toArray()); |
|
|
|
m.put("count", b.toArray()); |
|
|
|
return m; |
|
|
|
} |
|
|
|
|
|
|
|
public List<InventoryVo> getDayReportSh(InventoryQuery pq){ |
|
|
|
public List<InventoryVo> getDayReportSh(InventoryQuery pq) { |
|
|
|
InventoryQuery params = pq; |
|
|
|
QueryWrapper<Inventory> wq = new QueryWrapper<>(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
if (params != null){ |
|
|
|
if (params != null) { |
|
|
|
|
|
|
|
// if (StringUtils.isNotBlank(params.getStartDate())){
|
|
|
|
// wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate());
|
|
|
|
@ -616,93 +620,96 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
// }else {
|
|
|
|
// wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6)));
|
|
|
|
// }
|
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())){ |
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())) { |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
|
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
params.setStartDate(sdf.format(DateUtil.yesterday())); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())){ |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
}else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())) { |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6))); |
|
|
|
; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getBrand_name())){ |
|
|
|
wq.eq("brand_name",params.getBrand_name()); |
|
|
|
if (StringUtils.isNotBlank(params.getBrand_name())) { |
|
|
|
wq.eq("brand_name", params.getBrand_name()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getMateriel_group())){ |
|
|
|
wq.in("materiel_group",params.getMateriel_group()); |
|
|
|
}else{ |
|
|
|
wq.in("materiel_group","1","2"); |
|
|
|
if (StringUtils.isNotBlank(params.getMateriel_group())) { |
|
|
|
wq.in("materiel_group", params.getMateriel_group()); |
|
|
|
} else { |
|
|
|
wq.in("materiel_group", "1", "2"); |
|
|
|
} |
|
|
|
} |
|
|
|
wq.in("storehouse_code","07300003","07300006","07300008","07300002"); |
|
|
|
wq.in("storehouse_code", "07300003", "07300006", "07300008", "07300002"); |
|
|
|
List<InventoryVo> inventoryVos = baseMapper.getDayReportSh(wq); |
|
|
|
List<InventoryVo> b=new ArrayList<>(); |
|
|
|
List<InventoryVo> b = new ArrayList<>(); |
|
|
|
//6
|
|
|
|
long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for(int k=0;k<i+1;k++){ |
|
|
|
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()),-k)); |
|
|
|
long i = DateUtil.between(DateUtil.parse(params.getStartDate()), DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for (int k = 0; k < i + 1; k++) { |
|
|
|
String date = sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()), -k)); |
|
|
|
b.add(new InventoryVo()); |
|
|
|
for(InventoryVo vo:inventoryVos){ |
|
|
|
if(vo.getTime().equals(date)){ |
|
|
|
b.set(k,vo); |
|
|
|
for (InventoryVo vo : inventoryVos) { |
|
|
|
if (vo.getTime().equals(date)) { |
|
|
|
b.set(k, vo); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return b; |
|
|
|
} |
|
|
|
public Map<String,Object> getDayReportShMap(InventoryQuery pq){ |
|
|
|
|
|
|
|
public Map<String, Object> getDayReportShMap(InventoryQuery pq) { |
|
|
|
InventoryQuery params = pq; |
|
|
|
QueryWrapper<Inventory> wq = new QueryWrapper<>(); |
|
|
|
Map<String,Object> m=new HashMap<>(); |
|
|
|
Map<String, Object> m = new HashMap<>(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
if (params != null){ |
|
|
|
if (params != null) { |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())){ |
|
|
|
if (StringUtils.isNotBlank(params.getStartDate())) { |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
|
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
params.setStartDate(sdf.format(DateUtil.yesterday())); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); |
|
|
|
wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())){ |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
}else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); |
|
|
|
if (StringUtils.isNotBlank(params.getEndDate())) { |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} else { |
|
|
|
params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6))); |
|
|
|
; |
|
|
|
wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getBrand_name())){ |
|
|
|
wq.eq("brand_name",params.getBrand_name()); |
|
|
|
if (StringUtils.isNotBlank(params.getBrand_name())) { |
|
|
|
wq.eq("brand_name", params.getBrand_name()); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(params.getMateriel_group())){ |
|
|
|
wq.in("materiel_group",params.getMateriel_group()); |
|
|
|
}else{ |
|
|
|
wq.in("materiel_group","1","2"); |
|
|
|
if (StringUtils.isNotBlank(params.getMateriel_group())) { |
|
|
|
wq.in("materiel_group", params.getMateriel_group()); |
|
|
|
} else { |
|
|
|
wq.in("materiel_group", "1", "2"); |
|
|
|
} |
|
|
|
} |
|
|
|
wq.in("storehouse_code","07300003","07300006","07300008","07300002"); |
|
|
|
wq.in("storehouse_code", "07300003", "07300006", "07300008", "07300002"); |
|
|
|
List<InventoryVo> inventoryVos = baseMapper.getDayReportSh(wq); |
|
|
|
List<String> a=new ArrayList<>(); |
|
|
|
List<String> b=new ArrayList<>(); |
|
|
|
List<String> a = new ArrayList<>(); |
|
|
|
List<String> b = new ArrayList<>(); |
|
|
|
//6
|
|
|
|
long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for(int k=0;k<i+1;k++){ |
|
|
|
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()),-k)); |
|
|
|
long i = DateUtil.between(DateUtil.parse(params.getStartDate()), DateUtil.parse(params.getEndDate()), DateUnit.DAY); |
|
|
|
for (int k = 0; k < i + 1; k++) { |
|
|
|
String date = sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getStartDate()), -k)); |
|
|
|
a.add(date); |
|
|
|
b.add("0"); |
|
|
|
for(InventoryVo vo:inventoryVos){ |
|
|
|
if(vo.getTime().equals(date)){ |
|
|
|
b.set(k,String.valueOf(vo.getAmount_money())); |
|
|
|
for (InventoryVo vo : inventoryVos) { |
|
|
|
if (vo.getTime().equals(date)) { |
|
|
|
b.set(k, String.valueOf(vo.getAmount_money())); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
m.put("date",a.toArray()); |
|
|
|
m.put("count",b.toArray()); |
|
|
|
m.put("date", a.toArray()); |
|
|
|
m.put("count", b.toArray()); |
|
|
|
|
|
|
|
return m; |
|
|
|
} |
|
|
|
@ -717,18 +724,21 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> { |
|
|
|
String[] wlz = new String[]{"组件", "逆变器"}; |
|
|
|
qw.in("materiel_group_text", wlz); |
|
|
|
|
|
|
|
String dataDate = DateUtil.format(new Date(), "yyyy-MM-dd"); |
|
|
|
if(StrUtil.isNotBlank(params.getDataDate())){ |
|
|
|
dataDate = params.getDataDate(); |
|
|
|
String dataDate = DateUtil.format(DateUtil.tomorrow(), "yyyy-MM-dd"); |
|
|
|
if (StrUtil.isNotBlank(params.getDataDate())) { |
|
|
|
dataDate = DateUtil.format(DateUtil.offsetDay(DateUtil.parse(params.getDataDate()), 1), "yyyy-MM-dd"); |
|
|
|
// dataDate = params.getDataDate();
|
|
|
|
} |
|
|
|
qw.eq("time", dataDate); |
|
|
|
|
|
|
|
if(params.getStorehouses()!=null&¶ms.getStorehouses().length>0){ |
|
|
|
if (params.getStorehouses() != null && params.getStorehouses().length > 0) { |
|
|
|
qw.in("storehouse_name", params.getStorehouses()); |
|
|
|
} else { |
|
|
|
qw.in("storehouse_name", new String[]{"江西余干库", "庄河荣名库", "安阳荣名库", "曲阜荣名库"}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Map<String,Object> countall = baseMapper.countall(qw); |
|
|
|
Map<String, Object> countall = baseMapper.countall(qw); |
|
|
|
map.put("countall", countall); |
|
|
|
|
|
|
|
|
|
|
|
|
liupopo
1 year ago