no message

skyouc

昨天 9a3370c0ba5e04b0f48148eeafe6cec0b1ab9590

no message

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

@@ -166,6 +166,8 @@
        } else if (type == 3) {
            workService.pickWrkMast(workNo, getUserId());
            return R.ok("工作档已拣料");
        } else if (type == 4) {
            workService.backLocOperation(workNo, getUserId());
        }
        return R.ok();
    }

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -454,7 +454,7 @@
            throw new CoolException("机台信息不存在或已禁用！！");
        }

        List<LocAroundBind> binds = locAroundBindService.selectList( new EntityWrapper<LocAroundBind>()
        List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
                .eq("dev_no", basDevice.getDevNo())
                .eq("is_default", 1));

@@ -1324,25 +1324,26 @@
            throw new CoolException(workNo + "工作档不存在");
        }
        Integer ioType = wrkMast.getIoType() - 50;
        int wokNo = wrkMast.getWrkNo();
//        int wokNo = wrkMast.getWrkNo();
        // 入出库类型判断
        if (Objects.isNull(wrkMast.getWrkCode())) {
            if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
                throw new CoolException("当前入出库类型无法进行操作");
            }
            // 工作状态判断
            if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
                throw new CoolException("当前工作状态无法进行操作");
            }
        } else {
            if (wrkMast.getIoType() == 103) {
                ioType = 1;
            } else if (wrkMast.getIoType() == 101) {
                ioType = 10;
            }

            wokNo = commonService.getWorkNo(0);
//        if (Objects.isNull(wrkMast.getWrkCode())) {
        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
            throw new CoolException("当前入出库类型无法进行操作");
        }
        // 工作状态判断
        if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
            throw new CoolException("当前工作状态无法进行操作");
        }
//        }

//        else {
//            if (wrkMast.getIoType() == 103) {
//                ioType = 1;
//            } else if (wrkMast.getIoType() == 101) {
//                ioType = 10;
//            }
//            wokNo = commonService.getWorkNo(0);
//        }
        // 保存工作明细档历史档
//        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//            throw new CoolException("保存工作明细档历史档失败");
@@ -1390,7 +1391,7 @@


    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void backLocOperation(String workNo, Long userId) {
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)) {
@@ -1440,7 +1441,6 @@
        if (Cools.isEmpty(wrkDetls)) {
            throw new CoolException("数据错误，任务档明细不存在 ！！");
        }

        wrkDetls.forEach(wrkDetl -> {
            WrkDetl wrkDetl1 = new WrkDetl();
            BeanUtils.copyProperties(wrkDetl, wrkDetl1);
@@ -1459,8 +1459,6 @@
            throw new CoolException("修改库位状态失败");
        }
    }




    @Override

 src/main/webapp/static/js/orderPakout/out.js

@@ -159,7 +159,7 @@
                                    // {type: 'checkbox', merge: ['orderNo']},
                                    {field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
                                    {field: 'title', title: '商品', merge: true, align: 'center', width: 350},
                                    {field: 'standby1', title: '机台号', align: 'center'},
                                    {field: 'standby1', title: '机台号', align: 'center', edit: true},
                                    {
                                        field: 'anfme',
                                        title: '数量',

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

@@ -293,10 +293,13 @@
                break;
            //空板回库
            case 'empty':
                layer.confirm('空板入库该笔工作档', {title: '工作号：'+data.wrkNo, shadeClose: true}, function () {
                    http.post()
                })
                layer.closeAll();
                layer.confirm('拣料入库该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:4}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })
                    layer.closeAll();
                });
                break;
            //  拣料入库
            case 'pick':