feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验

gaoluyang

8 天以前 7bd10d34e8a8dc2437ec8551eb511e37634d7306

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
package cn.iocoder.yudao.module.mes.dal.mysql.wm.sorting;
 
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sorting.vo.MesWmSortTaskPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.sorting.MesWmSortTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.sorting.MesWmSortWarehouseStatisticsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
 
import java.time.LocalDateTime;
import java.util.List;
 
/**
 * MES 分拣任务 Mapper
 */
@Mapper
public interface MesWmSortTaskMapper extends BaseMapperX<MesWmSortTaskDO> {
 
    default PageResult<MesWmSortTaskDO> selectPage(MesWmSortTaskPageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<MesWmSortTaskDO>()
                .likeIfPresent(MesWmSortTaskDO::getCode, reqVO.getCode())
                .likeIfPresent(MesWmSortTaskDO::getNoticeCode, reqVO.getNoticeCode())
                .likeIfPresent(MesWmSortTaskDO::getSaleOrderCode, reqVO.getSaleOrderCode())
                .likeIfPresent(MesWmSortTaskDO::getRecipientName, reqVO.getRecipientName())
                .eqIfPresent(MesWmSortTaskDO::getStatus, reqVO.getStatus())
                .betweenIfPresent(MesWmSortTaskDO::getCreateTime, reqVO.getCreateTime())
                .orderByDesc(MesWmSortTaskDO::getId));
    }
 
    default MesWmSortTaskDO selectByNoticeId(Long noticeId) {
        return selectOne(new LambdaQueryWrapperX<MesWmSortTaskDO>()
                .eq(MesWmSortTaskDO::getNoticeId, noticeId)
                .ne(MesWmSortTaskDO::getStatus, cn.iocoder.yudao.module.mes.enums.wm.MesWmSortTaskStatusEnum.CANCELED.getStatus())
                .last("LIMIT 1"));
    }
 
    default MesWmSortTaskDO selectByCode(String code) {
        return selectOne(MesWmSortTaskDO::getCode, code);
    }
 
    /**
     * 按仓库统计已完成的分拣任务（需求 6.7④ 分拣出库统计）
     *
     * 只统计已完成（status=3）的分拣任务，按明细行上的仓库汇总任务数、计划/实际分拣数量
     */
    @Select("<script>"
            + "SELECT l.warehouse_id AS warehouseId, COUNT(DISTINCT t.id) AS taskCount, "
            + "IFNULL(SUM(l.plan_quantity), 0) AS planQuantity, "
            + "IFNULL(SUM(l.sorted_quantity), 0) AS sortedQuantity "
            + "FROM mes_wm_sort_task t INNER JOIN mes_wm_sort_task_line l ON l.task_id = t.id AND l.deleted = 0 "
            + "WHERE t.deleted = 0 AND t.status = 3 "
            + "<if test='warehouseId != null'>AND l.warehouse_id = #{warehouseId} </if>"
            + "<if test='beginTime != null'>AND t.sort_time &gt;= #{beginTime} </if>"
            + "<if test='endTime != null'>AND t.sort_time &lt;= #{endTime} </if>"
            + "GROUP BY l.warehouse_id ORDER BY sortedQuantity DESC"
            + "</script>")
    List<MesWmSortWarehouseStatisticsDO> selectWarehouseStatistics(@Param("warehouseId") Long warehouseId,
                                                                  @Param("beginTime") LocalDateTime beginTime,
                                                                  @Param("endTime") LocalDateTime endTime);
 
}