123

zhang

5 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -94,12 +94,111 @@
   @ManagerAuth(memo = "工作档修改")
    public R update(WrkMast wrkMast){
        if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
            return R.error();
            return R.error("工作号异常");
        }else if (wrkMast.getWrkSts()==null){
            return R.error("修改状态异常");
        }
        wrkMast.setModiUser(getUserId());
        wrkMast.setModiTime(new Date());
        wrkMastService.updateById(wrkMast);
        WrkMast wrkMast1=null;
        try{
            wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
            if (Cools.isEmpty(wrkMast1) || null==wrkMast1.getWrkNo()){
                throw new CoolException("工作号"+wrkMast.getWrkNo()+"所属工作档查询失败");
            }else if (wrkMast1.getWrkSts()==null){
                throw new CoolException("工作号"+wrkMast.getWrkNo()+"所属工作档状态异常");
            }
        }catch (Exception e){
            return R.error("失败!!!请尝试刷新页面。"+"异常原因："+e);
        }
        if (wrkMast1.getWrkSts()-wrkMast.getWrkSts()==0){
            return R.error("所选状态与此工作档状态一致，无需修改");
        }
        if (juBge(wrkMast.getWrkSts(), wrkMast1)){
            return R.error("修改状态失败，请规范操作");
        }
        wrkMast1.setModiUser(getUserId());
        wrkMast1.setModiTime(new Date());
        wrkMast1.setWrkSts(wrkMast.getWrkSts());
        wrkMastService.updateById(wrkMast1);
        return R.ok();
    }

    public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
        if (wrkSts1>20){
            throw new CoolException("大于20的状态不能进行修改！！！");
        }
        switch (wrkMast1.getIoType()){
            case 1:
            case 10:
            case 53:
            case 54:
            case 57:
                if (wrkSts1>=1 && wrkSts1<=10){
                    if (wrkSts1==10){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getLocNo()));
                        if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位异常请维护库位数据");
                        }
                        if (locMast.getLocSts().equals("S")||locMast.getLocSts().equals("Q")){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态为"+locMast.getLocSts$()+"，请维护库位数据");
                        }else if (locMast.getLocSts().equals("F")){
                        }else {
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }
                return true;
            case 101:
            case 103:
            case 104:
            case 107:
            case 110:
                if (wrkSts1>=11 && wrkSts1<=18){
                    if (wrkSts1==18){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getSourceLocNo()));
                        if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位异常请维护库位数据");
                        }
                        if (locMast.getLocSts().equals("R")||locMast.getLocSts().equals("P")){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态为"+locMast.getLocSts$()+"，请维护库位数据");
                        }else if (locMast.getLocSts().equals("O")){
                        }else {
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }
                return true;
            case 11:
                return false;
            case 3:
            case 6:
            default:
                return true;
        }
    }
    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+"操作失败");
        }
    }

    @RequestMapping(value = "/wrkMast/delete/auth")
@@ -180,104 +279,6 @@


    /********************************边锋新增**************************/
    @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) {
@@ -417,6 +418,7 @@
            wrkDetl.setModiTime(now);
            wrkDetl.setAppeUser(1L);
            wrkDetl.setModiUser(1L);
            wrkDetl.setMatType(locDetl.getMatType());
            wrkDetlService.insert(wrkDetl);

        }