wms / wms4_shenzhenxinyi · Commits

Commit b3e78a768fb2be974c11c95c4bf10850947438c1

Authored by 肖超群
1 parent 58872808

update

Inline Side-by-side
Showing 1 changed file with 23 additions and 23 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @b3e78a7
... ... @@ -494,25 +494,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
494 494 return Result.error("没有正常状态的库存详情");
495 495 }
496 496 for (InventoryDetail inventoryDetail : inventoryDetailList) {
497   - if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) {
498   - TaskDetail taskDetail = new TaskDetail();
499   - taskDetail.setTaskHeaderId(taskHeader.getId());
500   - taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY);
501   - taskDetail.setWarehouseCode(warehouseCode);
502   - taskDetail.setCompanyCode(inventoryDetail.getCompanyCode());
503   - taskDetail.setMaterialCode(inventoryDetail.getMaterialCode());
504   - taskDetail.setMaterialName(inventoryDetail.getMaterialName());
505   - taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec());
506   - taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit());
507   - taskDetail.setFromInventoryDetailId(inventoryDetail.getId());
508   - taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
509   - taskDetail.setQty(inventoryDetail.getQty());
510   - taskDetail.setBatch(inventoryDetail.getBatch());
511   - taskDetail.setLot(inventoryDetail.getLot());
512   - taskDetail.setProject(inventoryDetail.getProject());
513   - taskDetail.setReceiveTime(inventoryDetail.getReceiveTime());
514   - taskDetailList.add(taskDetail);
515   - }
  497 + if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) {
  498 + TaskDetail taskDetail = new TaskDetail();
  499 + taskDetail.setTaskHeaderId(taskHeader.getId());
  500 + taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY);
  501 + taskDetail.setWarehouseCode(warehouseCode);
  502 + taskDetail.setCompanyCode(inventoryDetail.getCompanyCode());
  503 + taskDetail.setMaterialCode(inventoryDetail.getMaterialCode());
  504 + taskDetail.setMaterialName(inventoryDetail.getMaterialName());
  505 + taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec());
  506 + taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit());
  507 + taskDetail.setFromInventoryDetailId(inventoryDetail.getId());
  508 + taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
  509 + taskDetail.setQty(inventoryDetail.getQty());
  510 + taskDetail.setBatch(inventoryDetail.getBatch());
  511 + taskDetail.setLot(inventoryDetail.getLot());
  512 + taskDetail.setProject(inventoryDetail.getProject());
  513 + taskDetail.setReceiveTime(inventoryDetail.getReceiveTime());
  514 + taskDetailList.add(taskDetail);
  515 + }
516 516 TaskDetail taskDetail = new TaskDetail();
517 517 taskDetail.setTaskHeaderId(taskHeader.getId());
518 518 taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY);
... ... @@ -531,7 +531,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
531 531 taskDetail.setReceiveTime(inventoryDetail.getReceiveTime());
532 532 taskDetailList.add(taskDetail);
533 533  
534   -
535 534 }
536 535 success = taskDetailService.saveBatch(taskDetailList);
537 536 if (!success) {
... ... @@ -1345,7 +1344,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1345 1344 if (!receiptDetailService.updateById(updateReceiptDetail)) {
1346 1345 throw new JeecgBootException("完成入库任务时，更新入库单详情失败");
1347 1346 }
1348   -
  1347 +
1349 1348 // 计算换算单位数量
1350 1349 materialMultipleService.materialMultiple(taskDetail);
1351 1350  
... ... @@ -1391,10 +1390,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1391 1390 inventoryTransaction.setProject(taskDetail.getProject());
1392 1391 inventoryTransaction.setSn(taskDetail.getSn());
1393 1392 inventoryTransaction.setInventoryStatus(taskDetail.getInventoryStatus());
1394   - inventoryTransaction.setReceiptQty(receiptQty);
  1393 + inventoryTransaction.setReceiptQty(taskDetail.getQty());
  1394 + inventoryTransaction.setQty(taskDetail.getQty());
1395 1395 // 获得库存数量
1396 1396 BigDecimal inventoryQty = inventoryDetailService.getInventorySumQty(inventoryDetail);
1397   - inventoryQty = inventoryQty.add(receiptQty);
  1397 + inventoryQty = inventoryQty.add(taskDetail.getQty());
1398 1398 inventoryTransaction.setInventoryQty(inventoryQty);
1399 1399 inventoryTransactionList.add(inventoryTransaction);
1400 1400 }
... ...