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

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-04-16 15:50:58 +08:00
parent 344488f08e c2da7640c3
commit 823afd7a00
19 changed files with 647 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
klp-wms/src/main/java/com/klp/controller/WmsAnnealOperateEventController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsAnnealOperateEventVo;
import com.klp.domain.bo.WmsAnnealOperateEventBo;
import com.klp.service.IWmsAnnealOperateEventService;
import com.klp.common.core.page.TableDataInfo;
/**
* 退火操作事件
*
* @author klp
* @date 2026-04-16
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/wms/annealOperateEvent")
public class WmsAnnealOperateEventController extends BaseController {
private final IWmsAnnealOperateEventService iWmsAnnealOperateEventService;
/**
* 查询退火操作事件列表
*/
@GetMapping("/list")
public TableDataInfo<WmsAnnealOperateEventVo> list(WmsAnnealOperateEventBo bo, PageQuery pageQuery) {
return iWmsAnnealOperateEventService.queryPageList(bo, pageQuery);
}
/**
* 导出退火操作事件列表
*/
@Log(title = "退火操作事件", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsAnnealOperateEventBo bo, HttpServletResponse response) {
List<WmsAnnealOperateEventVo> list = iWmsAnnealOperateEventService.queryList(bo);
ExcelUtil.exportExcel(list, "退火操作事件", WmsAnnealOperateEventVo.class, response);
}
/**
* 获取退火操作事件详细信息
*
* @param eventId 主键
*/
@GetMapping("/{eventId}")
public R<WmsAnnealOperateEventVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long eventId) {
return R.ok(iWmsAnnealOperateEventService.queryById(eventId));
}
/**
* 新增退火操作事件
*/
@Log(title = "退火操作事件", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsAnnealOperateEventBo bo) {
return toAjax(iWmsAnnealOperateEventService.insertByBo(bo));
}
/**
* 修改退火操作事件
*/
@Log(title = "退火操作事件", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsAnnealOperateEventBo bo) {
return toAjax(iWmsAnnealOperateEventService.updateByBo(bo));
}
/**
* 删除退火操作事件
*
* @param eventIds 主键串
*/
@Log(title = "退火操作事件", businessType = BusinessType.DELETE)
@DeleteMapping("/{eventIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] eventIds) {
return toAjax(iWmsAnnealOperateEventService.deleteWithValidByIds(Arrays.asList(eventIds), true));
}
}

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

@@ -68,6 +68,15 @@ public class WmsMaterialCoilController extends BaseController {
return iWmsMaterialCoilService.queryPageListWithBindInfo(bo, pageQuery);
}
/**
* 统计筛选条件下的全量汇总数据
* 独立的统计接口，使用与分页列表相同的查询条件
*/
@GetMapping("/statisticsList")
public R<Map<String, java.math.BigDecimal>> getStatistics(WmsMaterialCoilBo bo) {
return R.ok(iWmsMaterialCoilService.getStatistics(bo));
}
/**
* 原料钢卷库位分布查询（先库位，再钢卷映射）
*/

53
klp-wms/src/main/java/com/klp/domain/WmsAnnealOperateEvent.java Normal file
View File

@@ -0,0 +1,53 @@
package com.klp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 退火操作事件对象 wms_anneal_operate_event
*
* @author klp
* @date 2026-04-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_anneal_operate_event")
public class WmsAnnealOperateEvent extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "event_id")
private Long eventId;
/**
* 退火炉ID
*/
private Long annealFurnaceId;
/**
* 操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET
*/
private String operateType;
/**
* 操作内容描述
*/
private String operateContent;
/**
* 钢卷ID(可选)
*/
private Long coilId;
/**
* 删除标志（0=正常,1=已删除）
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

4
klp-wms/src/main/java/com/klp/domain/WmsWarehouse.java
View File

@@ -40,6 +40,10 @@ public class WmsWarehouse extends TreeEntity<WmsWarehouse> {
* 同级排序号
*/
private Long sortNo;
/**
* 使用次数（用于排序：使用越多越靠前）
*/
private Integer useCount;
/**
* 是否启用（0=否，1=是）
*/

51
klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealOperateEventBo.java Normal file
View File

@@ -0,0 +1,51 @@
package com.klp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 退火操作事件业务对象 wms_anneal_operate_event
*
* @author klp
* @date 2026-04-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsAnnealOperateEventBo extends BaseEntity {
/**
* 主键ID
*/
private Long eventId;
/**
* 退火炉ID
*/
private Long annealFurnaceId;
/**
* 操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET
*/
private String operateType;
/**
* 操作内容描述
*/
private String operateContent;
/**
* 钢卷ID(可选)
*/
private Long coilId;
/**
* 备注
*/
private String remark;
}

10
klp-wms/src/main/java/com/klp/domain/bo/WmsWarehouseBo.java
View File

@@ -47,6 +47,11 @@ public class WmsWarehouseBo extends TreeEntity<WmsWarehouseBo> {
*/
private Long sortNo;
/**
* 使用次数（用于排序：使用越多越靠前）
*/
private Integer useCount;
/**
* 是否启用（0=否，1=是）
*/
@@ -57,5 +62,10 @@ public class WmsWarehouseBo extends TreeEntity<WmsWarehouseBo> {
*/
private String remark;
/**
* 是否按使用次数排序（true=按useCount降序，false或不传=按sortNo升序）
*/
private Boolean orderByUseCount;
}

59
klp-wms/src/main/java/com/klp/domain/vo/WmsAnnealOperateEventVo.java Normal file
View File

@@ -0,0 +1,59 @@
package com.klp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 退火操作事件视图对象 wms_anneal_operate_event
*
* @author klp
* @date 2026-04-16
*/
@Data
@ExcelIgnoreUnannotated
public class WmsAnnealOperateEventVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long eventId;
/**
* 退火炉ID
*/
@ExcelProperty(value = "退火炉ID")
private Long annealFurnaceId;
/**
* 操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET
*/
@ExcelProperty(value = "操作类型 如:START/PAUSE/STOP/FEED/TAKE/RESET")
private String operateType;
/**
* 操作内容描述
*/
@ExcelProperty(value = "操作内容描述")
private String operateContent;
/**
* 钢卷ID(可选)
*/
@ExcelProperty(value = "钢卷ID(可选)")
private Long coilId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

6
klp-wms/src/main/java/com/klp/domain/vo/WmsWarehouseVo.java
View File

@@ -56,6 +56,12 @@ public class WmsWarehouseVo {
@ExcelProperty(value = "同级排序号")
private Long sortNo;
/**
* 使用次数（用于排序：使用越多越靠前）
*/
@ExcelProperty(value = "使用次数")
private Integer useCount;
/**
* 是否启用（0=否，1=是）
*/

15
klp-wms/src/main/java/com/klp/mapper/WmsAnnealOperateEventMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.mapper;
import com.klp.domain.WmsAnnealOperateEvent;
import com.klp.domain.vo.WmsAnnealOperateEventVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 退火操作事件Mapper接口
*
* @author klp
* @date 2026-04-16
*/
public interface WmsAnnealOperateEventMapper extends BaseMapperPlus<WmsAnnealOperateEventMapper, WmsAnnealOperateEvent, WmsAnnealOperateEventVo> {
}

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

@@ -97,5 +97,20 @@ List<WmsMaterialCoilDeliveryExportVo> selectDeliveryExportListByCoilIds(@Param("
* @return 不匹配的钢卷列表
*/
List<WmsMaterialCoil> selectMismatchedItemCoils();
/**
* 统计筛选条件下的全量汇总数据（高性能：只查sum/count）
* @param qw 查询条件（只使用WHERE和JOIN部分）
* @return 统计结果（Map包含totalGrossWeight, totalNetWeight）
*/
Map<String, Object> selectStatistics(@Param("ew") QueryWrapper<WmsMaterialCoil> qw);
/**
* 统计仓库使用次数（按warehouse_id出现次数排序）
*
* @param warehouseIds 仓库ID列表
* @return 每个仓库的钢卷数量
*/
List<Map<String, Object>> selectWarehouseIdCount(@Param("list") List<Long> warehouseIds);
}

49
klp-wms/src/main/java/com/klp/service/IWmsAnnealOperateEventService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.service;
import com.klp.domain.WmsAnnealOperateEvent;
import com.klp.domain.vo.WmsAnnealOperateEventVo;
import com.klp.domain.bo.WmsAnnealOperateEventBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 退火操作事件Service接口
*
* @author klp
* @date 2026-04-16
*/
public interface IWmsAnnealOperateEventService {
/**
* 查询退火操作事件
*/
WmsAnnealOperateEventVo queryById(Long eventId);
/**
* 查询退火操作事件列表
*/
TableDataInfo<WmsAnnealOperateEventVo> queryPageList(WmsAnnealOperateEventBo bo, PageQuery pageQuery);
/**
* 查询退火操作事件列表
*/
List<WmsAnnealOperateEventVo> queryList(WmsAnnealOperateEventBo bo);
/**
* 新增退火操作事件
*/
Boolean insertByBo(WmsAnnealOperateEventBo bo);
/**
* 修改退火操作事件
*/
Boolean updateByBo(WmsAnnealOperateEventBo bo);
/**
* 校验并批量删除退火操作事件信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

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

@@ -42,6 +42,12 @@ public interface IWmsMaterialCoilService {
*/
List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo);
/**
* 统计筛选条件下的全量汇总数据（高性能：只查sum/count）
* 独立的统计接口，不影响分页查询
*/
Map<String, java.math.BigDecimal> getStatistics(WmsMaterialCoilBo bo);
/**
* 新增钢卷物料表
*/

112
klp-wms/src/main/java/com/klp/service/impl/WmsAnnealOperateEventServiceImpl.java Normal file
View File

@@ -0,0 +1,112 @@
package com.klp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.domain.bo.WmsAnnealOperateEventBo;
import com.klp.domain.vo.WmsAnnealOperateEventVo;
import com.klp.domain.WmsAnnealOperateEvent;
import com.klp.mapper.WmsAnnealOperateEventMapper;
import com.klp.service.IWmsAnnealOperateEventService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 退火操作事件Service业务层处理
*
* @author klp
* @date 2026-04-16
*/
@RequiredArgsConstructor
@Service
public class WmsAnnealOperateEventServiceImpl implements IWmsAnnealOperateEventService {
private final WmsAnnealOperateEventMapper baseMapper;
/**
* 查询退火操作事件
*/
@Override
public WmsAnnealOperateEventVo queryById(Long eventId){
return baseMapper.selectVoById(eventId);
}
/**
* 查询退火操作事件列表
*/
@Override
public TableDataInfo<WmsAnnealOperateEventVo> queryPageList(WmsAnnealOperateEventBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsAnnealOperateEvent> lqw = buildQueryWrapper(bo);
Page<WmsAnnealOperateEventVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询退火操作事件列表
*/
@Override
public List<WmsAnnealOperateEventVo> queryList(WmsAnnealOperateEventBo bo) {
LambdaQueryWrapper<WmsAnnealOperateEvent> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsAnnealOperateEvent> buildQueryWrapper(WmsAnnealOperateEventBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsAnnealOperateEvent> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getAnnealFurnaceId() != null, WmsAnnealOperateEvent::getAnnealFurnaceId, bo.getAnnealFurnaceId());
lqw.eq(StringUtils.isNotBlank(bo.getOperateType()), WmsAnnealOperateEvent::getOperateType, bo.getOperateType());
lqw.eq(StringUtils.isNotBlank(bo.getOperateContent()), WmsAnnealOperateEvent::getOperateContent, bo.getOperateContent());
lqw.eq(bo.getCoilId() != null, WmsAnnealOperateEvent::getCoilId, bo.getCoilId());
return lqw;
}
/**
* 新增退火操作事件
*/
@Override
public Boolean insertByBo(WmsAnnealOperateEventBo bo) {
WmsAnnealOperateEvent add = BeanUtil.toBean(bo, WmsAnnealOperateEvent.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setEventId(add.getEventId());
}
return flag;
}
/**
* 修改退火操作事件
*/
@Override
public Boolean updateByBo(WmsAnnealOperateEventBo bo) {
WmsAnnealOperateEvent update = BeanUtil.toBean(bo, WmsAnnealOperateEvent.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsAnnealOperateEvent entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除退火操作事件
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

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

@@ -342,6 +342,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
return TableDataInfo.build(bindResult);
}
/**
* 统计筛选条件下的全量汇总数据（高性能：只查sum/count）
* 独立的统计接口，不影响分页查询
*/
@Override
public Map<String, BigDecimal> getStatistics(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
return selectMaterialCoilStatistics(qw);
}
private Page<WmsMaterialCoilVo> queryMaterialCoilPage(WmsMaterialCoilBo bo, PageQuery pageQuery) {
QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
Page<WmsMaterialCoilVo> result;
@@ -380,6 +390,30 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
}
}
/**
* 统计筛选条件下的全量汇总数据（高性能：只查sum/count）
*/
private Map<String, BigDecimal> selectMaterialCoilStatistics(QueryWrapper<WmsMaterialCoil> qw) {
Map<String, BigDecimal> result = new HashMap<>();
result.put("total_gross_weight", BigDecimal.ZERO);
result.put("total_net_weight", BigDecimal.ZERO);
result.put("total_count", BigDecimal.ZERO);
try {
Map<String, Object> stats = baseMapper.selectStatistics(qw);
if (stats != null) {
Object grossWeight = stats.get("total_gross_weight");
Object netWeight = stats.get("total_net_weight");
result.put("total_gross_weight", grossWeight != null ? new BigDecimal(grossWeight.toString()) : BigDecimal.ZERO);
result.put("total_net_weight", netWeight != null ? new BigDecimal(netWeight.toString()) : BigDecimal.ZERO);
}
} catch (Exception e) {
log.warn("统计查询失败: {}", e.getMessage());
}
return result;
}
private void fillBindInfoForPage(List<WmsMaterialCoilBindVo> records) {
// 绑定信息仅用于专用接口，避免污染通用分页结构
try {

9
klp-wms/src/main/java/com/klp/service/impl/WmsWarehouseServiceImpl.java
View File

@@ -54,9 +54,14 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService {
lqw.like(StringUtils.isNotBlank(bo.getWarehouseName()), WmsWarehouse::getWarehouseName, bo.getWarehouseName());
lqw.eq(bo.getWarehouseType() != null, WmsWarehouse::getWarehouseType, bo.getWarehouseType());
lqw.eq(bo.getSortNo() != null, WmsWarehouse::getSortNo, bo.getSortNo());
lqw.eq(bo.getUseCount() != null, WmsWarehouse::getUseCount, bo.getUseCount());
lqw.eq(bo.getIsEnabled() != null, WmsWarehouse::getIsEnabled, bo.getIsEnabled());
// 新增排序（SortNo升序）
lqw.orderByAsc(WmsWarehouse::getSortNo);
// 排序逻辑：orderByUseCount为true时按useCount降序，否则按sortNo升序
if (Boolean.TRUE.equals(bo.getOrderByUseCount())) {
lqw.orderByDesc(WmsWarehouse::getUseCount).orderByAsc(WmsWarehouse::getSortNo);
} else {
lqw.orderByAsc(WmsWarehouse::getSortNo);
}
return lqw;
}

61
klp-wms/src/main/java/com/klp/task/WarehouseUseCountTask.java Normal file
View File

@@ -0,0 +1,61 @@
package com.klp.task;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.klp.domain.WmsWarehouse;
import com.klp.mapper.WmsMaterialCoilMapper;
import com.klp.mapper.WmsWarehouseMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j
@RequiredArgsConstructor
@Component
public class WarehouseUseCountTask {
private final WmsMaterialCoilMapper materialCoilMapper;
private final WmsWarehouseMapper warehouseMapper;
@Scheduled(cron = "0 0 1 * * ?")
@Transactional(rollbackFor = Exception.class)
public void calculateWarehouseUseCount() {
log.info("[仓库使用次数定时任务] 开始计算仓库使用次数");
LambdaQueryWrapper<WmsWarehouse> wrapper = new LambdaQueryWrapper<>();
wrapper.select(WmsWarehouse::getWarehouseId);
List<WmsWarehouse> warehouses = warehouseMapper.selectList(wrapper);
if (warehouses.isEmpty()) {
log.info("[仓库使用次数定时任务] 未找到仓库记录");
return;
}
List<Long> warehouseIds = warehouses.stream()
.map(WmsWarehouse::getWarehouseId)
.collect(Collectors.toList());
List<Map<String, Object>> countList = materialCoilMapper.selectWarehouseIdCount(warehouseIds);
Map<Long, Long> countMap = new HashMap<>();
for (Map<String, Object> item : countList) {
Long wid = ((Number) item.get("warehouse_id")).longValue();
Long count = ((Number) item.get("coil_count")).longValue();
countMap.put(wid, count);
}
for (WmsWarehouse warehouse : warehouses) {
Long count = countMap.getOrDefault(warehouse.getWarehouseId(), 0L);
warehouse.setUseCount(count.intValue());
warehouseMapper.updateById(warehouse);
}
log.info("[仓库使用次数定时任务] 完成，共更新 {} 个仓库", warehouses.size());
}
}

22
klp-wms/src/main/resources/mapper/klp/WmsAnnealOperateEventMapper.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsAnnealOperateEventMapper">
<resultMap type="com.klp.domain.WmsAnnealOperateEvent" id="WmsAnnealOperateEventResult">
<result property="eventId" column="event_id"/>
<result property="annealFurnaceId" column="anneal_furnace_id"/>
<result property="operateType" column="operate_type"/>
<result property="operateContent" column="operate_content"/>
<result property="coilId" column="coil_id"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>

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

@@ -902,5 +902,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</select>
<!-- 统计筛选条件下的全量汇总数据（高性能：只查sum/count） -->
<select id="selectStatistics" resultType="java.util.Map">
SELECT
IFNULL(SUM(mc.gross_weight), 0) AS total_gross_weight,
IFNULL(SUM(mc.net_weight), 0) AS total_net_weight,
COUNT(mc.coil_id) AS total_count
FROM wms_material_coil mc
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
LEFT JOIN sys_user su ON mc.sale_id = su.user_id
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
LEFT JOIN (
SELECT coil_id, COUNT(*) AS abnormal_count
FROM wms_coil_abnormal
WHERE del_flag = 0
GROUP BY coil_id
) ca ON mc.coil_id = ca.coil_id
${ew.customSqlSegment}
</select>
<!-- 统计仓库使用次数（按warehouse_id出现次数排序） -->
<select id="selectWarehouseIdCount" resultType="java.util.Map">
SELECT warehouse_id, COUNT(*) AS coil_count
FROM wms_material_coil
WHERE del_flag = 0
AND warehouse_id IN
<foreach collection="list" item="wid" open="(" separator="," close=")">
#{wid}
</foreach>
GROUP BY warehouse_id
</select>
</mapper>

1
klp-wms/src/main/resources/mapper/klp/WmsWarehouseMapper.xml
View File

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseName" column="warehouse_name"/>
<result property="warehouseType" column="warehouse_type"/>
<result property="sortNo" column="sort_no"/>
<result property="useCount" column="use_count"/>
<result property="isEnabled" column="is_enabled"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>