DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增双向统计接口

Browse Source
This commit is contained in:
86156
2025-10-29 14:13:06 +08:00
parent 995636fc9d
commit 128700da0f
6 changed files with 163 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
View File

@@ -122,5 +122,25 @@ public class WmsMaterialCoilController extends BaseController {
Map<String, Object> traceResult = iWmsMaterialCoilService.queryTrace(enterCoilNo, currentCoilNo);
return R.ok(traceResult);
}
/**
* 查询各个库区中不同类型的钢卷分布情况
* 按库区分组，统计每种物品类型的钢卷数量和重量
*/
@GetMapping("/distributionByWarehouse")
public R<List<WmsMaterialCoilVo>> getDistributionByWarehouse() {
List<WmsMaterialCoilVo> distribution = iWmsMaterialCoilService.getDistributionByWarehouse();
return R.ok(distribution);
}
/**
* 查询不同类型的钢卷在不同库区的分布情况
* 按物品类型分组，统计每个库区的钢卷数量和重量
*/
@GetMapping("/distributionByItemType")
public R<List<WmsMaterialCoilVo>> getDistributionByItemType() {
List<WmsMaterialCoilVo> distribution = iWmsMaterialCoilService.getDistributionByItemType();
return R.ok(distribution);
}
}

22
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
View File

@@ -158,6 +158,28 @@ public class WmsMaterialCoilVo {
*/
private List<WmsBomItemVo> bomItemList;
// ========== 统计相关属性 ==========
/**
* 库区名称（用于统计查询）
*/
private String warehouseName;
/**
* 钢卷数量（用于统计查询）
*/
private Long coilCount;
/**
* 总毛重（用于统计查询）
*/
private BigDecimal totalGrossWeight;
/**
* 总净重（用于统计查询）
*/
private BigDecimal totalNetWeight;
}

17
klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java
View File

@@ -3,6 +3,8 @@ package com.klp.mapper;
import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import java.util.List;
import java.util.Map;
/**
* 钢卷物料表Mapper接口
@@ -12,5 +14,20 @@ import com.klp.common.core.mapper.BaseMapperPlus;
*/
public interface WmsMaterialCoilMapper extends BaseMapperPlus<WmsMaterialCoilMapper, WmsMaterialCoil, WmsMaterialCoilVo> {
/**
* 查询各个库区中不同类型的钢卷分布情况
* 按库区分组，统计每种物品类型的钢卷数量和重量
*
* @return 分布情况列表
*/
List<Map<String, Object>> getDistributionByWarehouse();
/**
* 查询不同类型的钢卷在不同库区的分布情况
* 按物品类型分组，统计每个库区的钢卷数量和重量
*
* @return 分布情况列表
*/
List<Map<String, Object>> getDistributionByItemType();
}

17
klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
View File

@@ -1,6 +1,5 @@
package com.klp.service;
import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.common.core.page.TableDataInfo;
@@ -65,5 +64,21 @@ public interface IWmsMaterialCoilService {
* @return 溯源结果（包含二维码信息和数据库记录）
*/
Map<String, Object> queryTrace(String enterCoilNo, String currentCoilNo);
/**
* 查询各个库区中不同类型的钢卷分布情况
* 按库区分组，统计每种物品类型的钢卷数量和重量
*
* @return 分布情况列表，包含库区信息、物品类型、数量、重量等
*/
List<WmsMaterialCoilVo> getDistributionByWarehouse();
/**
* 查询不同类型的钢卷在不同库区的分布情况
* 按物品类型分组，统计每个库区的钢卷数量和重量
*
* @return 分布情况列表，包含物品类型、库区信息、数量、重量等
*/
List<WmsMaterialCoilVo> getDistributionByItemType();
}

45
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -18,9 +18,7 @@ import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.vo.WmsGenerateRecordVo;
import com.klp.domain.vo.WmsWarehouseVo;
import com.klp.domain.vo.WmsRawMaterialVo;
import com.klp.domain.vo.WmsProductBomVo;
import com.klp.domain.vo.WmsBomItemVo;
import com.klp.domain.bo.WmsProductBomBo;
import com.klp.domain.bo.WmsBomItemBo;
import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.WmsStock;
@@ -45,6 +43,7 @@ import java.util.HashMap;
import java.util.stream.Collectors;
import java.util.HashSet;
import java.util.Set;
import java.math.BigDecimal;
/**
* 钢卷物料表Service业务层处理
@@ -1008,5 +1007,47 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
}
}
}
/**
* 查询各个库区中不同类型的钢卷分布情况
* 按库区分组，统计每种物品类型的钢卷数量和重量
*
* @return 分布情况列表，包含库区信息、物品类型、数量、重量等
*/
@Override
public List<WmsMaterialCoilVo> getDistributionByWarehouse() {
List<Map<String, Object>> mapList = baseMapper.getDistributionByWarehouse();
return convertMapListToVoList(mapList);
}
/**
* 查询不同类型的钢卷在不同库区的分布情况
* 按物品类型分组，统计每个库区的钢卷数量和重量
*
* @return 分布情况列表，包含物品类型、库区信息、数量、重量等
*/
@Override
public List<WmsMaterialCoilVo> getDistributionByItemType() {
List<Map<String, Object>> mapList = baseMapper.getDistributionByItemType();
return convertMapListToVoList(mapList);
}
/**
* 将Map列表转换为WmsMaterialCoilVo列表
*/
private List<WmsMaterialCoilVo> convertMapListToVoList(List<Map<String, Object>> mapList) {
List<WmsMaterialCoilVo> voList = new ArrayList<>();
for (Map<String, Object> map : mapList) {
WmsMaterialCoilVo vo = new WmsMaterialCoilVo();
vo.setWarehouseId(map.get("warehouse_id") != null ? Long.valueOf(map.get("warehouse_id").toString()) : null);
vo.setWarehouseName(map.get("warehouse_name") != null ? map.get("warehouse_name").toString() : null);
vo.setItemType(map.get("item_type") != null ? map.get("item_type").toString() : null);
vo.setCoilCount(map.get("coil_count") != null ? Long.valueOf(map.get("coil_count").toString()) : 0L);
vo.setTotalGrossWeight(map.get("total_gross_weight") != null ? new BigDecimal(map.get("total_gross_weight").toString()) : BigDecimal.ZERO);
vo.setTotalNetWeight(map.get("total_net_weight") != null ? new BigDecimal(map.get("total_net_weight").toString()) : BigDecimal.ZERO);
voList.add(vo);
}
return voList;
}
}

45
klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
View File

@@ -29,6 +29,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
</resultMap>
<!-- 统计查询专用的ResultMap -->
<resultMap type="com.klp.domain.vo.WmsMaterialCoilVo" id="WmsMaterialCoilDistributionResult">
<result property="warehouseId" column="warehouse_id"/>
<result property="warehouseName" column="warehouse_name"/>
<result property="itemType" column="item_type"/>
<result property="coilCount" column="coil_count"/>
<result property="totalGrossWeight" column="total_gross_weight"/>
<result property="totalNetWeight" column="total_net_weight"/>
</resultMap>
<!-- 查询各个库区中不同类型的钢卷分布情况 -->
<select id="getDistributionByWarehouse" resultType="java.util.Map">
SELECT
w.warehouse_id,
w.warehouse_name,
mc.item_type,
COUNT(mc.coil_id) as coil_count,
COALESCE(SUM(mc.gross_weight), 0) as total_gross_weight,
COALESCE(SUM(mc.net_weight), 0) as total_net_weight
FROM wms_warehouse w
LEFT JOIN wms_material_coil mc ON w.warehouse_id = mc.warehouse_id
AND mc.data_type = 1
AND mc.del_flag = '0'
WHERE w.del_flag = '0'
GROUP BY w.warehouse_id, w.warehouse_name, mc.item_type
ORDER BY w.warehouse_id, mc.item_type
</select>
<!-- 查询不同类型的钢卷在不同库区的分布情况 -->
<select id="getDistributionByItemType" resultType="java.util.Map">
SELECT
mc.item_type,
w.warehouse_id,
w.warehouse_name,
COUNT(mc.coil_id) as coil_count,
COALESCE(SUM(mc.gross_weight), 0) as total_gross_weight,
COALESCE(SUM(mc.net_weight), 0) as total_net_weight
FROM wms_material_coil mc
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
WHERE mc.data_type = 1
AND mc.del_flag = '0'
AND (w.del_flag = '0' OR w.del_flag IS NULL)
GROUP BY mc.item_type, w.warehouse_id, w.warehouse_name
ORDER BY mc.item_type, w.warehouse_id
</select>
</mapper>