rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
@@ -24,6 +24,7 @@ ORDER_WORK_TYPE_STOCK_OUT("15", "库存出库"), ORDER_WORK_TYPE_STOCK_CHECK("16", "盘点出库"), ORDER_WORK_TYPE_STOCK_TERANSFER("17", "调拔出库单"), ORDER_WORK_TYPE_STOCK_UP("18", "备货出库单"), ORDER_WORK_TYPE_OTHER("14", "其它出库单"); @@ -64,6 +65,8 @@ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type; } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) { return OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type; }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.desc)) { return OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type; } return null; } @@ -103,6 +106,8 @@ return OrderType.ORDER_TRANSFER.type; } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc)) { return OrderType.ORDER_REVISE.type; }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.desc)) { return OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type; } return null; } @@ -136,6 +141,8 @@ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc; } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type)) { return OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.desc; }else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)) { return OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.desc; } return null; } rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
@@ -18,6 +18,8 @@ TASK_RESOUCE_EMPTY_TYPE("6", "空容器出库任务"), TASK_RESOUCE_STOCK_UP("7", "备货出库任务"), ; TaskResouceType(String val, String desc) { this.val = Short.parseShort(val); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -247,7 +247,9 @@ if (Objects.isNull(matnr)) { throw new CoolException("数据错误：物料" + wkOrderItem.getMatnrCode() + "不存在！！"); } Long originalId = wkOrderItem.getId(); BeanUtils.copyProperties(matnr, wkOrderItem); wkOrderItem.setId(originalId); wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName()); WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString())); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -174,6 +174,11 @@ if (!locService.updateById(loc)) { throw new CoolException("库位状态更新失败！！"); } //增加对备货单得判断 Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val) ? TaskStsType.MISSION_INITIAL.id:TaskStsType.GENERATE_OUT.id; Task moveTask = new Task(); String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null); task.setOrgLoc(loc.getCode()) @@ -185,7 +190,7 @@ .setCreateBy(loginUserId) .setCreateTime(new Date()) .setUpdateTime(new Date()) .setTaskStatus(TaskStsType.GENERATE_OUT.id) .setTaskStatus(taskStatus) .setBarcode(loc.getBarcode()) .setMemo(map.getMemo());
@@ -501,6 +501,11 @@ return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0; }).reversed()).collect(Collectors.toList()); WkOrder wkOrder = outStockService.getById(outId); if (Cools.isEmpty(wkOrder)) { throw new CoolException("单据不存在！！"); } for (OutStockToTaskParams param : Items) { if (Objects.isNull(param) || StringUtils.isBlank(param.getLocCode())) { continue; @@ -533,9 +538,13 @@ .setItems(locItems) .setSourceId(outId) .setSiteNo(param.getSiteNo()); //增加备货出库类型判断 Short type = wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type) ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val; try { //生成出库任务 locItemService.generateTask(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val, taskParams, loginUserId); locItemService.generateTask(type, taskParams, loginUserId); } catch (Exception e) { logger.error("UNK", e); throw new CoolException(e.getMessage());
