#

LSH

2022-11-25 7059a74b4213af5e3c6de691ef92564e3cb1c316

#

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

@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
@@ -179,6 +180,105 @@


    /********************************边锋新增**************************/
    @RequestMapping(value = "/wrkMast/red/wrk/mast")
    @ManagerAuth(memo = "维护工作档")
    public R redWrkMast(@RequestBody List<WrkMast> list) {
        if (list.isEmpty()) {
            return R.error("请至少选择一行数据");
        }
        StringBuilder logWrkMast= new StringBuilder();
        try{
            for (WrkMast entity : list){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()));
                if (Cools.isEmpty(wrkMast)){
                    continue;
                }
                if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10){//1.入库//10.空板入库
//                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
//                if (Cools.isEmpty(locMast)){
//                    logWrkMast=logWrkMast+"工作号："+wrkMast.getWrkNo()+"库位查询为无!"+"//n";
//                    continue;
//                }
//                if (wrkMast.getWrkSts()==9){//9.入库完成
//                    if (locMast.getLocSts().equals("F")){//F.在库
//                        over(wrkMast);
//                    }else if (locMast.getLocSts().equals("S")){//S.入库预约
//                        doIn(wrkMast,locMast);
//                    }
//                }
                    continue;
                }else if (wrkMast.getIoType()==53 || wrkMast.getIoType()==57){//53.拣料再入库//57.盘点再入库
                    continue;
                }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){//101.出库//110.空板出库
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
                    if (Cools.isEmpty(locMast)){
                        logWrkMast.append("工作号：").append(wrkMast.getWrkNo()).append("库位查询为无!").append("//n");
                        continue;
                    }
                    if (wrkMast.getWrkSts()==17){//17.出库完成
                        if (locMast.getLocSts().equals("O")){//O.空库位
                            logWrkMast.append("维护工作档：").append(wrkMast.getWrkNo()).append("//n");
                        }else if (locMast.getLocSts().equals("R")){//R.出库预约
                            doOut(wrkMast,locMast);
                            logWrkMast.append("维护工作档：").append(wrkMast.getWrkNo()).append("//n");
                        }else {
                            logWrkMast.append("工作号：").append(wrkMast.getWrkNo()).append(" 库位状态异常!").append("//n");
                            continue;
                        }
                        wrkMast.setWrkSts(18L);
                        wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()));
                    }
//                    else if (wrkMast.getWrkSts()==18){//18.出库更新完成
//                        if (locMast.getLocSts().equals("O")){//O.空库位
//                            over(wrkMast);
//                            logWrkMast.append("维护工作档：").append(wrkMast.getWrkNo()).append("//n");
//                        }else if (locMast.getLocSts().equals("R")){//R.出库预约
//                            doOut(wrkMast,locMast);
//                            over(wrkMast);
//                            logWrkMast.append("维护工作档：").append(wrkMast.getWrkNo()).append("//n");
//                        } else {
//                            logWrkMast.append("工作号：").append(wrkMast.getWrkNo()).append(" 库位状态异常!").append("//n");
//                            continue;
//                        }
//                        wrkMastService.delete(new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()));
//                    }
                }else if (wrkMast.getIoType()==103 || wrkMast.getIoType()==107){//103.拣料出库//107.盘点出库
                    continue;
                }
            }
        }catch (Exception e){
            return R.error(logWrkMast+"操作失败");
        }
        return R.ok(logWrkMast+"操作成功");
    }
    private void doOut(WrkMast wrkMast,LocMast locMast){
        try{
            Date now = new Date();
            // 删除工作档源库位的库存明细
            if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
                throw new CoolException("删除库存明细失败:workNo="+wrkMast.getWrkNo()+"sourceLocNo="+wrkMast.getSourceLocNo());
            }
            // 修改源库位状态 R ===>> O
            if (locMast.getLocSts().equals("R")) {
                locMast.setLocSts("O");
                locMast.setBarcode("");
                locMast.setFrozen(0);
                locMast.setModiTime(now);
                locMast.setIoTime(now);
                locMast.setFrozenMemo("");
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("修改源库位状态失败:workNo="+wrkMast.getWrkNo()+"sourceLocNo="+wrkMast.getSourceLocNo());
                }
            }
        }catch (Exception e){
            throw new CoolException(e+"操作失败");
        }
    }
    private void doIn(WrkMast wrkMast,LocMast locMast){ }
    private void over(WrkMast wrkMast){

    }

    @GetMapping(value = "/wrkMast/checkDetl")
    public R pickDetl(String barcode) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);

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

@@ -267,6 +267,35 @@
                    });
                });
                break;
            case 'priWrkMast':
                var list=[];
                checkStatus.data.map(function (track) {
                    list.push({
                        wrkNo: track.wrkNo,
                        ioTime: track.ioTime,
                        ioPri: track.ioPri
                    });
                });
                $.ajax({
                    url: baseUrl+"/wrkMast/red/wrk/mast",
                    headers: {'token': localStorage.getItem('token')},
                    contentType:'application/json;charset=UTF-8',
                    data: JSON.stringify(list),
                    method: 'POST',
                    traditional:true,
                    success: function (res) {
                        layer.closeAll();
                        if (res.code === 200){
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(res.msg);
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        } else {
                            layer.msg(res.msg)
                        }
                    }
                })
                break;
        }
    });


 src/main/webapp/views/wrkMast/wrkMast.html

@@ -99,6 +99,7 @@
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>增加优先级</button>
        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>降低优先级</button>
        <button class="layui-btn layui-btn-normal" id="btn-wrk-mast" lay-event="priWrkMast"><i class="layui-icon"></i>维护工作档</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>