修复库位类型字段错误并优化工作档状态检查逻辑

zhangc

2024-12-06 03b0ea7369dcba72b560ec80f941f9d29ff7b9a5

 src/main/java/com/zy/asrs/controller/AgvWorkController.java

@@ -4,9 +4,11 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.AgvWorkService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -27,9 +29,39 @@

        List<AgvBasDevp> agvBasDevpList = JSONArray.parseArray(param, AgvBasDevp.class);

        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
        //return R.ok("任务号：" + startupDto.getWorkNo() + ";目标库位：" + startupDto.getLocNo());
        return R.ok("生成入库工作档成功");
    }

    @RequestMapping("/locDdetl/adjust/start")
    @ManagerAuth(memo = "")
    public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
        workService.adjustLocDetl(param, getUserId());
        return R.ok("库存调整成功");
    }

    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")
    public R handControlWrkMast(@RequestParam String workNo,
                                @RequestParam Integer type){
        if (type == 1) {
            workService.completeWrkMast(workNo, getUserId());
            return R.ok("工作档已完成");
        } else if (type == 2) {
            workService.cancelWrkMast(workNo, getUserId(),2);
            return R.ok("工作档已取消");
        } else if (type == 5) {
            workService.cancelWrkMast(workNo, getUserId(),5);
            return R.ok("工作档已取消");
        }
        return R.ok();
    }

    @RequestMapping("/hand/control/wrkMast/changeType")
    @ManagerAuth(memo = "切换调拨方式")
    public R handControlWrkMastChangeType(@RequestParam String workNo){
        workService.changeType(workNo, getUserId());
        return R.ok();
    }
}