| | |
|---|
| | | for (LocDetl detl : locDetlService.selectByLocNo(locNo)) { |
|---|
| | | if (!detl.getMatnr().equals(locDetl.getMatnr())) { |
|---|
| | | //不是相同物料 |
|---|
| | | if (Utils.getBay(locDetl.getLocNo())>=21){ |
|---|
| | | locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme())); |
|---|
| | | } |
|---|
| | | continue; |
|---|
| | | } |
|---|
| | | locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), detl.getAnfme())); |
|---|
| | |
|---|
| | | orderService.updateSettle(orderDetl.getOrderId(), 2L, userId); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | }else {//自动组托 |
|---|
| | | WaitPakin waitPakin = new WaitPakin(); |
|---|
| | | waitPakin.sync(mat); |
|---|
| | | waitPakin.setBatch(wrkDetl.getBatch()); |
|---|
| | | waitPakin.setZpallet(wrkDetl.getZpallet()); // 托盘码 |
|---|
| | | waitPakin.setIoStatus("N"); // 入出状态 |
|---|
| | | waitPakin.setAnfme(wrkDetl.getAnfme()); // 数量 |
|---|
| | | waitPakin.setStatus("Y"); // 状态 |
|---|
| | | waitPakin.setAppeUser(userId); |
|---|
| | | waitPakin.setAppeTime(now); |
|---|
| | | waitPakin.setModiUser(userId); |
|---|
| | | waitPakin.setModiTime(now); |
|---|
| | | waitPakin.setMemo(wrkDetl.getMemo()); |
|---|
| | | waitPakin.setFrozen(wrkDetl.getFrozen()); // 是否冻结 |
|---|
| | | waitPakin.setManu(wrkDetl.getManu()); |
|---|
| | | waitPakin.setMatType(mat.getMatType());//物料类型 |
|---|
| | | if (!waitPakinService.insert(waitPakin)) { |
|---|
| | | throw new CoolException("保存入库通知档失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // 修改库位状态: F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中 |
|---|
| | |
|---|
| | | } else if (wrkMast.getIoType() == 110) { |
|---|
| | | locSts = "D"; |
|---|
| | | // 库位转移 ===>> D.空桶/空栈板 |
|---|
| | | } else if (wrkMast.getIoType() == 11) { |
|---|
| | | } else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 111) { |
|---|
| | | if (wrkMast.getWrkSts() > 11){ |
|---|
| | | throw new CoolException("移库任务已在执行中，不能取消"); |
|---|
| | | } |
|---|
