diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java index 8f383cd..7ff6c62 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java @@ -494,25 +494,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea return Result.error("没有正常状态的库存详情"); } for (InventoryDetail inventoryDetail : inventoryDetailList) { - if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) { - TaskDetail taskDetail = new TaskDetail(); - taskDetail.setTaskHeaderId(taskHeader.getId()); - taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); - taskDetail.setWarehouseCode(warehouseCode); - taskDetail.setCompanyCode(inventoryDetail.getCompanyCode()); - taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); - taskDetail.setMaterialName(inventoryDetail.getMaterialName()); - taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec()); - taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit()); - taskDetail.setFromInventoryDetailId(inventoryDetail.getId()); - taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus()); - taskDetail.setQty(inventoryDetail.getQty()); - taskDetail.setBatch(inventoryDetail.getBatch()); - taskDetail.setLot(inventoryDetail.getLot()); - taskDetail.setProject(inventoryDetail.getProject()); - taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); - taskDetailList.add(taskDetail); - } + if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setTaskHeaderId(taskHeader.getId()); + taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); + taskDetail.setWarehouseCode(warehouseCode); + taskDetail.setCompanyCode(inventoryDetail.getCompanyCode()); + taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); + taskDetail.setMaterialName(inventoryDetail.getMaterialName()); + taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec()); + taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit()); + taskDetail.setFromInventoryDetailId(inventoryDetail.getId()); + taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus()); + taskDetail.setQty(inventoryDetail.getQty()); + taskDetail.setBatch(inventoryDetail.getBatch()); + taskDetail.setLot(inventoryDetail.getLot()); + taskDetail.setProject(inventoryDetail.getProject()); + taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); + taskDetailList.add(taskDetail); + } TaskDetail taskDetail = new TaskDetail(); taskDetail.setTaskHeaderId(taskHeader.getId()); taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); @@ -531,7 +531,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); taskDetailList.add(taskDetail); - } success = taskDetailService.saveBatch(taskDetailList); if (!success) { @@ -1345,7 +1344,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea if (!receiptDetailService.updateById(updateReceiptDetail)) { throw new JeecgBootException("完成入库任务时,更新入库单详情失败"); } - + // 计算换算单位数量 materialMultipleService.materialMultiple(taskDetail); @@ -1391,10 +1390,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea inventoryTransaction.setProject(taskDetail.getProject()); inventoryTransaction.setSn(taskDetail.getSn()); inventoryTransaction.setInventoryStatus(taskDetail.getInventoryStatus()); - inventoryTransaction.setReceiptQty(receiptQty); + inventoryTransaction.setReceiptQty(taskDetail.getQty()); + inventoryTransaction.setQty(taskDetail.getQty()); // 获得库存数量 BigDecimal inventoryQty = inventoryDetailService.getInventorySumQty(inventoryDetail); - inventoryQty = inventoryQty.add(receiptQty); + inventoryQty = inventoryQty.add(taskDetail.getQty()); inventoryTransaction.setInventoryQty(inventoryQty); inventoryTransactionList.add(inventoryTransaction); }