From a5d317341bf1b72f2854492b79ba468bda109e5d Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Mon, 4 Dec 2023 08:30:39 +0800
Subject: [PATCH] 修改物料增加接口
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java | 5 +++--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java | 6 ------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
index 56ec004..edd9255 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
@@ -400,15 +400,16 @@ public class ErpServiceImpl implements IErpService {
material.setId(material1.getId());
boolean success = materialService.updateById(material);
if (!success) {
- throw new JeecgBootException("增加物料失败, 更新时报错");
+ throw new JeecgBootException("更新物料失败, 更新时报错");
}
+ return Result.ok("更新物料成功");
} else {
boolean success = materialService.save(material);
if (!success) {
throw new JeecgBootException("增加物料失败, 保存时报错");
}
+ return Result.ok("增加物料成功");
}
- return Result.ok("增加物料成功");
}
@Override
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 7ff6c62..3fdb093 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
@@ -1321,7 +1321,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (receiptHeader == null) {
throw new JeecgBootException("未找到ID:" + receiptDetail.getReceiptId() + "入库单头");
}
-
// 操作记录统计用
taskDetail.setReceiptCode(receiptDetail.getReceiptCode());
BigDecimal qty = receiptDetail.getQty();
@@ -1333,21 +1332,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
updateReceiptDetail.setReceiptId(receiptId);
updateReceiptDetail.setReceiptQty(receiptDetailReceiptQty);
if (receiptDetailReceiptQty.compareTo(qty) >= 0) {
-
updateReceiptDetail.setStatus(QuantityConstant.RECEIPT_HEADER_COMPLETED);
} else {
-
updateReceiptDetail.setStatus(QuantityConstant.RECEIPT_HEADER_SHELF);
}
-
receiptDetaiList.add(updateReceiptDetail);
if (!receiptDetailService.updateById(updateReceiptDetail)) {
throw new JeecgBootException("完成入库任务时，更新入库单详情失败");
}
-
// 计算换算单位数量
materialMultipleService.materialMultiple(taskDetail);
-
InventoryDetail inventoryDetail = new InventoryDetail();
inventoryDetail.setInventoryHeaderId(inventoryHeader.getId());
inventoryDetail.setWarehouseCode(warehouseCode);
--
libgit2 0.22.2