| | |
| | | throw new CoolException("当前工作档已完成"); |
| | | } |
| | | // 入库 + 库位转移 |
| | | if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) { |
| | | if (wrkMast.getWrkSts() < 4 ) { |
| | | wrkMast.setWrkSts(4L); |
| | | WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode()).eq("wrk_sts",15L)); |
| | | if (!Cools.isEmpty(wrkMast)) { |
| | | if (!Cools.isEmpty(wrkMast) &&(wrkMast.getIoType()==1||wrkMast.getIoType()==11||wrkMast.getIoType()==10)) { |
| | | mast.setOveMk("Y"); |
| | | wrkMast.setModiTime(new Date()); |
| | | wrkMastService.updateById(mast); |
| | |
| | | mast.setSourceLocNo(wrkMast.getLocNo()); |
| | | mast.setLocNo(locNo.getLocNo()); // 目标库位 = 出库时的源库位 |
| | | mast.setModiTime(now); |
| | | mast.setWrkCode(workNo); |
| | | mast.setModiUser(userId); |
| | | if (!wrkMastService.insert(mast)) { |
| | | return R.error("更新工作档数据状态失败"); |