|
@@ -25,6 +25,7 @@ import com.ruoyi.reportManagement.service.ITWhgenlegService;
|
|
|
import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
|
|
|
import com.ruoyi.warehouseBusiness.domain.enums.WarehouseTypeEnum;
|
|
|
import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
|
|
|
+import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsMapper;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -50,9 +51,13 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
|
|
|
@Autowired
|
|
|
private TWarehouseMapper tWarehouseMapper;
|
|
|
+
|
|
|
@Autowired
|
|
|
private TCustomerContactMapper customerContactMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TWarehousebillsitemsMapper tWarehousebillsitemsMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 查询库存总账
|
|
|
*
|
|
@@ -685,10 +690,12 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
for (int i = -5; i <= 0; i++) {
|
|
|
categories.add(DateUtils.offsetOnlyMonth(i) + "月");
|
|
|
|
|
|
- weightMap = tWhgenlegMapper.biWeightInfo(DateUtils.beginOfOffsetMonth(i) + " 00:00:00",
|
|
|
- DateUtils.endOfOffsetMonth(i) + " 23:59:59", warehouseId);
|
|
|
- quantityInList.add(weightMap.get("quantityIn"));
|
|
|
- quantityList.add(weightMap.get("quantity"));
|
|
|
+ weightMap = tWarehousebillsitemsMapper.inAndOutStockStatistics("SJRK", DateUtils.beginOfOffsetMonth(i) + " 00:00:00",
|
|
|
+ DateUtils.endOfOffsetMonth(i) + " 23:59:59", null, warehouseId);
|
|
|
+ quantityInList.add(weightMap.get("total"));
|
|
|
+ weightMap = tWarehousebillsitemsMapper.inAndOutStockStatistics("SJCK", DateUtils.beginOfOffsetMonth(i) + " 00:00:00",
|
|
|
+ DateUtils.endOfOffsetMonth(i) + " 23:59:59", null, warehouseId);
|
|
|
+ quantityList.add(weightMap.get("total"));
|
|
|
}
|
|
|
|
|
|
seriesMap = new HashMap<>();
|
|
@@ -696,7 +703,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
seriesMap.put("data", quantityInList);
|
|
|
series.add(seriesMap);
|
|
|
seriesMap = new HashMap<>();
|
|
|
- seriesMap.put("name", "库存毛重");
|
|
|
+ seriesMap.put("name", "出库毛重");
|
|
|
seriesMap.put("data", quantityList);
|
|
|
series.add(seriesMap);
|
|
|
|