| | |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.core.common.Cools; |
| | | import com.core.common.SnowflakeIdWorker; |
| | | import com.core.exception.CoolException; |
| | | import com.zy.asrs.entity.*; |
| | | import com.zy.asrs.entity.param.LocDetlAdjustParam; |
| | |
| | | import com.zy.system.service.ConfigService; |
| | | import lombok.Synchronized; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.junit.Test; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | |
| | | private WrkMastExecuteService wrkMastExecuteService; |
| | | @Autowired |
| | | private ConfigService configService; |
| | | @Autowired |
| | | private SnowflakeIdWorker snowflakeIdWorker; |
| | | @Autowired |
| | | private FlowLogService flowLogService; |
| | | @Autowired |
| | | private LocDetlServiceImpl locDetlService; |
| | | |
| | | |
| | | /* |
| | |
| | | //生成工作档 |
| | | AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2))); |
| | | //生成工作档明细 |
| | | long flowId = snowflakeIdWorker.nextId(); |
| | | taskDto.getLocDtos().forEach(locDto -> { |
| | | if (!BaseController.isJSON(locDto.getOrderNo())) { |
| | | //明细档所需参数 |
| | |
| | | locDto.getCsocode(), |
| | | locDto.getIsoseq(), |
| | | locDto.getProcessSts()); |
| | | OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq()); |
| | | AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq()); |
| | | // 流水 -- 新增订单明细 |
| | | // FlowLog flowLog = new FlowLog(); |
| | | // flowLog.setFid(String.valueOf(flowId)); |
| | | // flowLog.setSpare2(wrkMast.getWrkNo().toString()); |
| | | // flowLog.setLocNo(wrkMast.getSourceLocNo()); |
| | | // flowLog.setSpare1(containerCode); |
| | | // flowLog.setOpType(4L); |
| | | // flowLog.setOrderNo(locDto.getOrderNo()); |
| | | // flowLog.setThreeCode(locDto.getCsocode()); |
| | | // flowLog.setMatnr(locDto.getMatnr()); |
| | | // flowLog.setMaktx(locDto.getMaktx()); |
| | | // flowLog.setOrderPrevious(orderDetl.getAnfme()); |
| | | // flowLog.setOrderCurrent(orderDetl.getAnfme()); |
| | | // flowLog.setOrderChanged(0.0); |
| | | // |
| | | // flowLog.setQtyPrevious(orderDetl.getQty()); |
| | | // flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme()); |
| | | // flowLog.setQtyChanged(locDto.getAnfme()); |
| | | // |
| | | // flowLog.setLocPrevious(locDetl.getAnfme()); |
| | | // flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme()); |
| | | // flowLog.setLocChanged(locDto.getAnfme()); |
| | | // flowLog.setUserId(userId); |
| | | // flowLog.setAppeTime(now); |
| | | // if (!flowLogService.insert(flowLog)) { |
| | | // throw new CoolException("同步半成品调拨单流水记录失败"); |
| | | // } |
| | | |
| | | }else { |
| | | List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class); |
| | | orderDtoList.forEach(orderDto -> { |
| | |
| | | locDto.getProcessSts()); |
| | | }); |
| | | } |
| | | |
| | | |
| | | //修改订单信息 |
| | | modifyOrderDetl(locDto, userId); |
| | |
| | | //生成工作档 |
| | | AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2))); |
| | | //生成工作档明细 |
| | | long flowId = snowflakeIdWorker.nextId(); |
| | | taskDto.getLocDtos().forEach(locDto -> { |
| | | if (!BaseController.isJSON(locDto.getOrderNo())) { |
| | | //明细档所需参数 |
| | |
| | | locDto.getCsocode(), |
| | | locDto.getIsoseq(), |
| | | locDto.getProcessSts()); |
| | | OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq()); |
| | | AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq()); |
| | | |
| | | // FlowLog flowLog = new FlowLog(); |
| | | // flowLog.setFid(String.valueOf(flowId)); |
| | | // flowLog.setSpare2(wrkMast.getWrkNo().toString()); |
| | | // flowLog.setLocNo(wrkMast.getSourceLocNo()); |
| | | // flowLog.setSpare1(containerCode); |
| | | // flowLog.setOpType(6L); |
| | | // flowLog.setOrderNo(locDto.getOrderNo()); |
| | | // flowLog.setThreeCode(locDto.getCsocode()); |
| | | // flowLog.setMatnr(locDto.getMatnr()); |
| | | // flowLog.setMaktx(locDto.getMaktx()); |
| | | // flowLog.setOrderPrevious(orderDetl.getAnfme()); |
| | | // flowLog.setOrderCurrent(orderDetl.getAnfme()); |
| | | // flowLog.setOrderChanged(0.0); |
| | | // |
| | | // flowLog.setQtyPrevious(orderDetl.getQty()); |
| | | // flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme()); |
| | | // flowLog.setQtyChanged(locDto.getAnfme()); |
| | | // |
| | | // flowLog.setLocPrevious(locDetl.getAnfme()); |
| | | // flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme()); |
| | | // flowLog.setLocChanged(locDto.getAnfme()); |
| | | // flowLog.setUserId(userId); |
| | | // flowLog.setAppeTime(now); |
| | | // if (!flowLogService.insert(flowLog)) { |
| | | // throw new CoolException("同步半成品调拨单流水记录失败"); |
| | | // } |
| | | }else { |
| | | List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class); |
| | | orderDtoList.forEach(orderDto -> { |
| | |
| | | String locNo = agvWrkMast.getLocNo(); |
| | | agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo()); |
| | | agvWrkMast.setSourceLocNo(locNo); |
| | | agvWrkMast.setModiTime(now); |
| | | agvWrkMast.setIoTime(now); |
| | | agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart"); |
| | | agvWrkMastService.updateById(agvWrkMast); |
| | | |
| | | List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo())); |
| | | for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) { |
| | | agvWrkDetl.setIoTime(now); |
| | | boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>() |
| | | .eq("wrk_no", agvWrkDetl.getWrkNo()) |
| | | .eq("matnr",agvWrkDetl.getMatnr()) |
| | | .eq("order_no",agvWrkDetl.getOrderNo()) |
| | | .eq("three_code",agvWrkDetl.getThreeCode())); |
| | | // .eq("dead_time",agvWrkDetl.getDeadTime())); |
| | | } |
| | | AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo()); |
| | | //List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo())); |
| | | AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo()); |
| | |
| | | br = 2; |
| | | } |
| | | if (agvBasDevp.getLocType1() != br) { |
| | | throw new CoolException("站点异常!"); |
| | | throw new CoolException("站点类型和货架类型不符!"); |
| | | } |
| | | if (containerType == 40) { |
| | | locType = 5; |
| | |
| | | //生成工作档 |
| | | AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType); |
| | | //生成工作档明细 |
| | | long flowId = snowflakeIdWorker.nextId(); |
| | | agvWaitPakinList.forEach(wp -> { |
| | | createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts()); |
| | | }); |
| | |
| | | AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station); |
| | | if(!agvBasDevp.getLocSts().equals("O")){ |
| | | throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts()+",无法进行空板出库"); |
| | | } |
| | | AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo())); |
| | | if(!Cools.isEmpty(agvWrkMast)){ |
| | | throw new CoolException("有货架在往站点搬运" + agvBasDevp.getDevNo()+",无法进行空板出库"); |
| | | } |
| | | |
| | | //寻找相应类型的空货架 |
| | |
| | | adjDetl.setLocNo(locDetl.getLocNo()); |
| | | adjDetl.setMatnr(locDetl.getMatnr()); |
| | | adjDetl.setBatch(locDetl.getBatch()); |
| | | adjDetl.setMaktx(locDetl.getMaktx()); |
| | | adjDetl.setOriQty(locDetl.getAnfme()); |
| | | adjDetl.setAdjQty(adjust.getCount()); |
| | | adjDetl.setModiTime(now); |
| | |
| | | adjDetl.setLocNo(locDetl.getLocNo()); |
| | | adjDetl.setMatnr(locDetl.getMatnr()); |
| | | adjDetl.setBatch(locDetl.getBatch()); |
| | | adjDetl.setMaktx(locDetl.getMaktx()); |
| | | adjDetl.setOriQty(locDetl.getAnfme()); |
| | | adjDetl.setAdjQty(0.0D); |
| | | adjDetl.setModiTime(now); |
| | |
| | | adjDetl.setLocNo(locMast.getLocNo()); |
| | | adjDetl.setMatnr(adjust.getMatnr()); |
| | | adjDetl.setBatch(adjust.getBatch()); |
| | | adjDetl.setMaktx(locDetl.getMaktx()); |
| | | adjDetl.setOriQty(0.0D); |
| | | adjDetl.setAdjQty(adjust.getCount()); |
| | | adjDetl.setModiTime(now); |
| | |
| | | @Transactional |
| | | public void cancelWrkMast(String workNo, Long userId,Integer type) { |
| | | AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo); |
| | | long flowId = snowflakeIdWorker.nextId(); |
| | | if (Cools.isEmpty(wrkMast)){ |
| | | throw new CoolException(workNo+"工作档不存在"); |
| | | } |
| | |
| | | // 回滚入库订单 |
| | | OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvWaitPakin.getThreeCode()).eq("matnr", agvWaitPakin.getMatnr()).eq("order_no", agvWaitPakin.getOrderNo())); |
| | | orderDetl.setQty(orderDetl.getQty() - agvWaitPakin.getAnfme()); |
| | | |
| | | if (!orderDetlService.updateById(orderDetl)) { |
| | | throw new CoolException("订单回滚失败"); |
| | | } |
| | | // FlowLog flowLog = new FlowLog(); |
| | | // flowLog.setFid(String.valueOf(flowId)); |
| | | // flowLog.setSpare2(wrkMast.getWrkNo().toString()); |
| | | // flowLog.setLocNo(locNo); |
| | | // flowLog.setSpare1(wrkMast.getBarcode()); |
| | | // flowLog.setOpType(3L); |
| | | // flowLog.setOrderNo(agvWaitPakin.getOrderNo()); |
| | | // flowLog.setThreeCode(agvWaitPakin.getThreeCode()); |
| | | // flowLog.setMatnr(agvWaitPakin.getMatnr()); |
| | | // flowLog.setMaktx(agvWaitPakin.getMaktx()); |
| | | // flowLog.setOrderPrevious(orderDetl.getAnfme()); |
| | | // flowLog.setOrderCurrent(orderDetl.getAnfme()); |
| | | // flowLog.setOrderChanged(0.0); |
| | | // |
| | | // flowLog.setQtyPrevious(orderDetl.getQty()); |
| | | // flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme()); |
| | | // flowLog.setQtyChanged(-agvWaitPakin.getAnfme()); |
| | | // |
| | | // flowLog.setLocPrevious(0.0); |
| | | // flowLog.setLocCurrent(0.0); |
| | | // flowLog.setLocChanged(-agvWaitPakin.getAnfme()); |
| | | // |
| | | // flowLog.setUserId(userId); |
| | | // flowLog.setAppeTime(new Date()); |
| | | // if (!flowLogService.insert(flowLog)) { |
| | | // throw new CoolException("同步半成品调拨单流水记录失败"); |
| | | // } |
| | | // 删除组托档 |
| | | if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) { |
| | | throw new CoolException("入库通知档取消失败"); |
| | |
| | | String targetLocNo = wrkMast.getLocNo(); |
| | | agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); |
| | | agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); |
| | | // 源库位 库位主档 |
| | | AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo)); |
| | | AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo)); |
| | | // 当前任务是跨层移库 且目标楼层是1楼的 回滚调拨单 |
| | | if (wrkMast.getIoType() == 12 && locMast.getFloor() == 1) { |
| | | if (wrkMast.getIoType() == 12 && locMast.getFloor() == 1 && sourceLocMast.getFloor() != 1) { |
| | | List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo)); |
| | | for (AgvLocDetl agvLocDetl : agvLocDetls) { |
| | | OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("order_no", "DB" + agvLocDetl.getOrderNo())); |
| | | orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme()); |
| | | if (!orderDetlService.updateById(orderDetl)) { |
| | | throw new CoolException("保存工作明细失败"); |
| | | throw new CoolException("更新订单明细失败"); |
| | | } |
| | | // FlowLog flowLog = new FlowLog(); |
| | | // flowLog.setFid(String.valueOf(flowId)); |
| | | // flowLog.setSpare2(wrkMast.getWrkNo().toString()); |
| | | // flowLog.setLocNo(locNo); |
| | | // flowLog.setSpare1(wrkMast.getBarcode()); |
| | | // flowLog.setOpType(8L); |
| | | // flowLog.setOrderNo(agvLocDetl.getOrderNo()); |
| | | // flowLog.setThreeCode(agvLocDetl.getThreeCode()); |
| | | // flowLog.setMatnr(agvLocDetl.getMatnr()); |
| | | // flowLog.setMaktx(agvLocDetl.getMaktx()); |
| | | // flowLog.setOrderPrevious(orderDetl.getAnfme()); |
| | | // flowLog.setOrderCurrent(orderDetl.getAnfme()); |
| | | // flowLog.setOrderChanged(0.0); |
| | | // |
| | | // flowLog.setQtyPrevious(orderDetl.getQty()); |
| | | // flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme()); |
| | | // flowLog.setQtyChanged(-agvLocDetl.getAnfme()); |
| | | // |
| | | // flowLog.setLocPrevious(0.0); |
| | | // flowLog.setLocCurrent(agvLocDetl.getAnfme()); |
| | | // flowLog.setLocChanged(agvLocDetl.getAnfme()); |
| | | // |
| | | // flowLog.setUserId(userId); |
| | | // flowLog.setAppeTime(new Date()); |
| | | // if (!flowLogService.insert(flowLog)) { |
| | | // throw new CoolException("同步半成品调拨单流水记录失败"); |
| | | // } |
| | | } |
| | | } else { |
| | | |
| | | } |
| | | |
| | | // 自动调拨出库取消 |
| | | } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) { |
| | | if (wrkMast.getIoType() == 112) { |
| | |
| | | String locNo = wrkMast.getSourceLocNo(); |
| | | // 目标库位 |
| | | String targetLocNo = wrkMast.getLocNo(); |
| | | agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0); |
| | | agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo), "", (short) 0); |
| | | if (wrkMast.getIoType() == 108) { |
| | | if (wrkMast.getWrkSts() != 22) { |
| | | agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); |
| | | agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null); |
| | | } |
| | | } else { |
| | | if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) { |
| | | if (wrkMast.getWrkSts() != 22) { |
| | | agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue()); |
| | | agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo, "O", "", wrkMast.getWhsType().shortValue()); |
| | | } |
| | | } else { |
| | | throw new CoolException("当前作业不能取消!"); |
| | |
| | | List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo)); |
| | | // 更新订单 |
| | | for (AgvLocDetl agvLocDetl : agvLocDetls) { |
| | | OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode())); |
| | | OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode())); |
| | | orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme()); |
| | | if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){ |
| | | throw new CoolException("修改订单明细失败,请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr()); |
| | | if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) { |
| | | throw new CoolException("修改订单明细失败,请联系管理员" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr()); |
| | | } |
| | | // FlowLog flowLog = new FlowLog(); |
| | | // flowLog.setFid(String.valueOf(flowId)); |
| | | // flowLog.setSpare2(wrkMast.getWrkNo().toString()); |
| | | // flowLog.setLocNo(locNo); |
| | | // flowLog.setSpare1(wrkMast.getBarcode()); |
| | | // flowLog.setOpType(9L); |
| | | // flowLog.setOrderNo(agvLocDetl.getOrderNo()); |
| | | // flowLog.setThreeCode(agvLocDetl.getThreeCode()); |
| | | // flowLog.setMatnr(agvLocDetl.getMatnr()); |
| | | // flowLog.setMaktx(agvLocDetl.getMaktx()); |
| | | // flowLog.setOrderPrevious(orderDetl.getAnfme()); |
| | | // flowLog.setOrderCurrent(orderDetl.getAnfme()); |
| | | // flowLog.setOrderChanged(0.0); |
| | | // |
| | | // flowLog.setQtyPrevious(orderDetl.getQty()); |
| | | // flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme()); |
| | | // flowLog.setQtyChanged(- agvLocDetl.getAnfme()); |
| | | // |
| | | // flowLog.setLocPrevious(0.0); |
| | | // flowLog.setLocCurrent(agvLocDetl.getAnfme()); |
| | | // flowLog.setLocChanged(agvLocDetl.getAnfme()); |
| | | // |
| | | // flowLog.setUserId(userId); |
| | | // flowLog.setAppeTime(new Date()); |
| | | // if (!flowLogService.insert(flowLog)) { |
| | | // throw new CoolException("同步半成品调拨单流水记录失败"); |
| | | // } |
| | | } |
| | | |
| | | // 回流单取消 |
| | | } else if (wrkMast.getIoType() == 114) { |
| | | //源库位 |
| | | String locNo = wrkMast.getSourceLocNo(); |
| | | // 目标库位 |
| | | String targetLocNo = wrkMast.getLocNo(); |
| | | agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); |
| | | agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); |
| | | // 源库位 库位主档 |
| | | AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo)); |
| | | AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo)); |
| | | // 当前任务是跨层移库 且目标楼层是1楼的 回滚调拨单 |
| | | List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo)); |
| | | for (AgvLocDetl agvLocDetl : agvLocDetls) { |
| | | OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 17)); |
| | | orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme()); |
| | | if (!orderDetlService.updateById(orderDetl)) { |
| | | throw new CoolException("更新订单明细失败"); |
| | | } |
| | | } |
| | | //出库取消 |
| | |
| | | |
| | | } |
| | | |
| | | if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12){ |
| | | if(wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){ |
| | | //订单回滚 |
| | | //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); |
| | | List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); |
| | |
| | | } |
| | | if (wrkMast.getIoType() == 108) { |
| | | wrkMast.setIoType(111); |
| | | wrkMast.setModiTime(new Date()); |
| | | agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo)); |
| | | } else if(wrkMast.getIoType() == 111) { |
| | | wrkMast.setIoType(108); |
| | | wrkMast.setModiTime(new Date()); |
| | | agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo)); |
| | | } |
| | | |