报工回传+库位显示

严智鑫

2024-12-11 044c32c15ee9ccac6f3b60eb6745025e2f4480f2

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java

@@ -1,9 +1,15 @@
package com.mes.md.controller;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.md.entity.KBBTLensSorting;
import com.mes.md.entity.LineConfiguration;
import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
import com.mes.md.mapper.KBBTLensSortingMapper;
import com.mes.md.mapper.MachineMapper;
import com.mes.md.mapper.TaskingMapper;
import com.mes.md.service.ProjectService;
import com.mes.md.service.TaskingService;
import com.mes.utils.Result;
@@ -12,6 +18,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -30,7 +37,65 @@
        private ProjectService projectService;
        @Autowired
        private MachineMapper machineMapper;
        @Autowired
        private TaskingMapper taskingMapper;

        @Autowired
        private KBBTLensSortingMapper kBBTLensSortingMapper;



        @ApiOperation("查询库位信息 返回结果")
        @PostMapping("/findKBBTLensSorting")
        @ResponseBody
        public Result findKBBTLensSorting(@RequestBody Map<String, String> map) {
            try {
                String scanId=map.get("scanId").toString();
                if (!scanId.isEmpty()){
                    List<KBBTLensSorting> list=kBBTLensSortingMapper.selectList(new QueryWrapper<KBBTLensSorting>().lambda()
                            .eq(KBBTLensSorting::getBarcode,scanId));
                    return Result.build(200,"成功",list);
                }
                return Result.build(199,"前端传值NULL",map);
            }catch (Exception e){
                return Result.build(199,"异常",map);
            }
        }
        @ApiOperation("扫码成功后返回结果 machineId,scanId")
        @PostMapping("/scanMachineAdd")
        @ResponseBody
        public Result scanMachineAdd(@RequestBody Map<String, String> map) {
            try {
                String machineId=map.get("machineId").toString();
                String scanId=map.get("scanId").toString();
                if (!scanId.isEmpty()&&!machineId.isEmpty()){
                    Machine machine = machineMapper.selectById(machineId);
                    int addCount =taskingService.scanMachineAdd(machine,scanId);
                    return Result.build(200,"成功",addCount);
                }
                return Result.build(199,"前端传值NULL",map);
            }catch (Exception e){
                return Result.build(199,"异常",map);
            }
        }
        @ApiOperation("报工提交 ")
        @PostMapping("/reportForWork")
        @ResponseBody
        public Result reportForWork(@RequestBody Machine machine) {
            try {
                int deleteCount=taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
                        .selectAll(Tasking.class)
                        .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
                        .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
                        .eq(LineConfiguration::getMachineId,machine.getId())
                        .eq(Tasking::getGlassState,"正常")
                        .eq(Tasking::getState,"线上")
                        .ne(Tasking::getWorkState,"完工"));
                return Result.build(200,"成功",deleteCount);
            }catch (Exception e){
                return Result.build(199,"异常",machine);
            }
        }
        @ApiOperation("查询当前设备，未完工状态的线上任务")
        @PostMapping("/findMachineTask")
        @ResponseBody
@@ -107,5 +172,13 @@
            return Result.build(200,"修改成功："+count,count);
        }

        @ApiOperation("提交 扫码报工 ")
        @PostMapping("/scanReport")
        @ResponseBody
        public Result scanReport(@RequestBody Tasking tasking) {
            int count =taskingService.stopTasking(tasking);
            return Result.build(200,"修改成功："+count,count);
        }

}