添加获取当前流程卡历史报工班组、设备程序

chenlu

2024-03-01 0710a8c37df5b8e2a94ba53c1f8c84e06d668d04

添加获取当前流程卡历史报工班组、设备程序

 north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue

@@ -396,7 +396,7 @@
            const type = await VXETable.modal.confirm('您确定要删除该数据?')
            if (type === 'confirm') {
              //保存排产数据
              request.post("/productionScheduling/addScheduling").then((res) => {
              request.post("/productionScheduling/deleteScheduling").then((res) => {
                if (res.code == 200) {
                  ElMessage.success("保存成功")
                  location.reload();

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java

@@ -64,4 +64,16 @@
        }
    }

    //添加排产数据
    @PostMapping("/deleteScheduling")
    public Result DeleteScheduling( @RequestBody Map<String,Object>  object){

        if(productionSchedulingService.AddSchedulingSv(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

        }
    }

}

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java

@@ -28,4 +28,10 @@
    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String previousProcess);

    List<Map<String,String>> SelectProcessMp();

    String historyProcessMp(String processIdStr);

    List<Map<String,String>> historyDeviceMp(String historyProcess, String process);

    List<Map<String,String>> historyTeamsMp(String historyProcess, String process);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -58,7 +58,6 @@
            }
        }


        //设备下拉框
        map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
        //班组下拉框
@@ -68,16 +67,13 @@
        //查询本工序报工需要哪几层，上工序是什么
        String  obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);


        //判断本工序是不是第一道工序
        if (interceptProcess.equals(process)) {
            //是第一道工序，查询流程卡数据
            map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr,technologyStr));

        }
        else {
            //不是第一道工序，查询报工数据

            map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr,technologyStr,previousProcess));
        }

@@ -85,8 +81,17 @@

        // 后续工序（上工序报工数-完工数-次破数-返工未完成数）

        return map;
        //获取该流程卡号历史报工工序
        String historyProcess =reportingWorkMapper.historyProcessMp(processIdStr);

        //历史报工工序设备
        map.put("historyDevice",reportingWorkMapper.historyDeviceMp(historyProcess,process));
        //历史报工工序班组
        map.put("historyTeams",reportingWorkMapper.historyTeamsMp(historyProcess,process));



        return map;
    }

    public Map<String, Object> SelectProcessSv() {

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -135,4 +135,38 @@

    </select>

    <select id="historyProcessMp">
        select ifnull(GROUP_CONCAT(distinct rw.this_process),"") from reporting_work as rw where rw.process_id=#{processIdStr}
    </select>

    <select id="historyDeviceMp">
        SELECT
            bdp.id,
            bdp.basic_type,
            bdp.basic_name,
            bd.basic_name AS basic_category
        FROM
            sd.basic_data AS bd
                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
        WHERE
            bd.basic_category = "process"
          AND bdp.basic_type = "device"
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>

    <select id="historyTeamsMp">
        SELECT
            bdp.id,
            bdp.basic_type,
            bdp.basic_name,
            bd.basic_name AS basic_category
        FROM
            sd.basic_data AS bd
                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
        WHERE
            bd.basic_category = "process"
          AND bdp.basic_type = "teamsgroups"
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>

</mapper>

 north-glass-erp/target/classes/mapper/pp/ReportingWork.xml

@@ -135,4 +135,38 @@

    </select>

    <select id="historyProcessMp">
        select ifnull(GROUP_CONCAT(distinct rw.this_process),"") from reporting_work as rw where rw.process_id=#{processIdStr}
    </select>

    <select id="historyDeviceMp">
        SELECT
            bdp.id,
            bdp.basic_type,
            bdp.basic_name,
            bd.basic_name AS basic_category
        FROM
            sd.basic_data AS bd
                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
        WHERE
            bd.basic_category = "process"
          AND bdp.basic_type = "device"
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>

    <select id="historyTeamsMp">
        SELECT
            bdp.id,
            bdp.basic_type,
            bdp.basic_name,
            bd.basic_name AS basic_category
        FROM
            sd.basic_data AS bd
                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
        WHERE
            bd.basic_category = "process"
          AND bdp.basic_type = "teamsgroups"
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>

</mapper>