#

whycq

2023-07-05 53524e38c61b150bd4d623e74343f9d839b5a0e6

#

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

@@ -1,8 +1,10 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
@@ -22,6 +24,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static java.lang.Integer.parseInt;

/**
 * 工作流接口控制器
@@ -129,6 +133,16 @@
        workService.adjustLocDetl(param, getUserId());
        return R.ok("库存调整成功");
    }
    @RequestMapping("/hand/query/wrkSts")
    @ManagerAuth(memo = "手动查询工作档")
    public R queryWrkSts(@RequestParam String workNo,
                                @RequestParam Integer type){
        EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
        wrapper.eq("wrk_no",parseInt(workNo));
        WrkMast wrkMast = wrkMastService.selectOne(wrapper);

        return R.ok().add(wrkMast);
    }

    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -293,7 +293,19 @@
                break;
            // 完成
            case 'complete':
                layer.confirm('确认完成该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                //先查询工作档状态
                let tit_text = ''
                http.post(baseUrl+"/hand/query/wrkSts", {workNo: data.wrkNo, type:1}, function (res) {
                    var sts = res.data.wrkSts
                    if (sts == 2 || sts == 9 || sts == 10 || sts == 11 || sts == 17 || sts == 18 ) {
                        tit_text = '确认完成该笔工作档？'
                    } else {
                        tit_text = '当前任务在运行中，确认完成该笔工作档？'
                    }
                    //$(".layui-laypage-btn")[0].click();
                    //layer.msg(data.wrkNo + res.msg);
                    console.log(tit_text)
                    layer.confirm(tit_text, {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
@@ -301,6 +313,7 @@
                    layer.closeAll();

                });
                })
                break;
            // 取消
            case 'cancel':
@@ -313,13 +326,23 @@
                        layer.closeAll();
                    });
                } else {
                    layer.confirm('确认取消该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    let tit_text = ''
                    http.post(baseUrl+"/hand/query/wrkSts", {workNo: data.wrkNo, type:1}, function (res) {
                        var sts = res.data.wrkSts
                        if (sts == 2 || sts == 9 || sts == 10 || sts == 11 || sts == 17 || sts == 18 ) {
                            tit_text = '确认取消该笔工作档？'
                        } else {
                            tit_text = '当前任务在运行中，确认完成该笔工作档？'
                        }
                        layer.confirm(tit_text, {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                        http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(data.wrkNo + res.msg);
                        })
                        layer.closeAll();
                    });
                    })

                }
                break;
            //  拣料入库