workLast

Fancy

2025-01-04 0760c4667043820b39add1d0c30910e57f4dc753

workLast

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkLastMapper.java

@@ -1,5 +1,6 @@
package com.dy.pmsGlobal.daoSta;

import cn.hutool.json.JSONObject;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import org.apache.ibatis.annotations.Mapper;

@@ -35,4 +36,6 @@
    List<StaAssemblyWorkLast> selectSome(Map<String, Object> params);

    StaAssemblyWorkLast existsEntity(StaAssemblyWorkLast record);

    List<JSONObject> queryWorkList();
}

 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml

@@ -332,6 +332,34 @@
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>
    <select id="queryWorkList" resultType="cn.hutool.json.JSONObject">
        WITH  a as ( SELECT pap.id as plan_id,pap.`name` as plan_name,
                            ppp.id as process_id,ppp.`name` as process_name,
                            ppn.id as node_id, ppn.content as node_name,
                            pp.`code` as pro_code , pp.`name` as pro_name,
                            pbn.batch_number as batch_number,      ppn.sort as sort
                     from  pr_assembly_plan pap, pr_production_process ppp,pr_production_node ppn,
                           plt_product pp,pr_batch_number pbn
                     WHERE pap.process_id = ppp.id and ppp.id = ppn.process_id
                       and pap.pro_id = pp.id and pap.batch_id = pbn.id
                     order by plan_id,process_id,sort)
        SELECT ps.station_name,ppl.line_name,sawl.user_name,sawl.assistants_name,sawl.plan_name ,sawl.process_name,sawl.node_name,sawl.dt,sawl.work_type FROM
            (SELECT id,`name` AS station_name, line_id  FROM plt_station WHERE deleted = 0 AND disabled = 0) ps
                LEFT JOIN  (SELECT id,`name` AS line_name FROM plt_production_line) ppl ON ps.line_id = ppl.id
                LEFT JOIN  (select w.station_id,b.`name` as user_name ,GROUP_CONCAT(us.name) as assistants_name, a.plan_name, a.process_name, a.node_name,w.dt,
                                   CASE w.work_type
                                       WHEN '1' THEN '组装'
                                       WHEN '2' THEN '测试'
                                       WHEN '3' THEN '品检'
                                       WHEN '4' THEN '维修'
                                       ELSE w.work_type END AS work_type
                            from sta_assembly_work_last w
                                     LEFT JOIN ba_user b ON w.user_id = b.id
                                     LEFT JOIN a ON w.plan_id = a.plan_id AND w.node_id = a.node_id
                                     LEFT JOIN ba_user us  ON FIND_IN_SET(us.id,w.assistants) GROUP BY w.id
            ) sawl ON ps.id = sawl.station_id
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete
        from sta_assembly_work_last

 pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java

@@ -55,6 +55,16 @@
        return BaseResponseUtils.buildSuccess(list);
    }
    /**
     * 任务看板  查询工站使用情况
     * */
    @GetMapping(path="queryWorkList")
    @Log("查询工站使用情况")
    public BaseResponse<List<JSONObject>> queryWorkList(){
        List<JSONObject> list = sv.queryWorkList();
        return BaseResponseUtils.buildSuccess(list);
    }

    /**
     * 任务看板  查询在产任务看板
     * */
    @GetMapping(path="queryOrderList")

 pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java

@@ -44,6 +44,8 @@
    private StaDeviceProductionLogMapper deviceProductionLogDao;
    private StaRepairInfoMapper repairInfoDao;
    private PrAssemblyPlanMapper assemblyPlanDao;
    private StaAssemblyWorkLastMapper assemblyWorkLastDao;

    private OthStatisticWorkloadMapper workloadDao;
    private PrOrderMapper orderDao;

@@ -75,6 +77,11 @@
    @Autowired
    public void setAssemblyPlanDao(PrAssemblyPlanMapper assemblyPlanDao) {
        this.assemblyPlanDao = assemblyPlanDao;
    }

    @Autowired
    public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
        this.assemblyWorkLastDao = assemblyWorkLastDao;
    }

    @Autowired
@@ -158,6 +165,10 @@
        return map.values().stream().collect(Collectors.toList());*/
        return list;
    }
    public List<JSONObject> queryWorkList() {
        List<JSONObject> list = assemblyWorkLastDao.queryWorkList();
        return list;
    }

    public List<JSONObject> queryOrderList() {
        List<JSONObject> list = assemblyPlanDao.queryPlanList();