From f425a29a2273a81478f3533476e3c8bd7743a0e4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 27 十二月 2024 07:43:46 +0800
Subject: [PATCH] 用户列表界面添加用户工序设置
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 41cb646..ed75d99 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -327,6 +327,15 @@
materialOutboundId = object.get("materialOutboundId").toString();
}
if(materialOutboundId!=null){
+ List<MaterialOutboundDetail> materialOutboundDetailLists = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
+ if (!materialOutboundDetailLists.isEmpty()) {
+ for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
+ //杩樺師鐗╂枡搴撳瓨鏁�
+ materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
+
+ }
+ }
+
materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
materialInventoryMapper.deleteMaterialOutbound(materialOutboundId);
materialInventoryMapper.deleteMaterialLog(materialOutboundId);
@@ -363,6 +372,15 @@
returningId = object.get("returningId").toString();
}
if(returningId!=null){
+
+ List<ReturningWarehouseDetail> returningWarehouseDetailLists = materialInventoryMapper.getIsNotReturningWarehouseDetail(returningId);
+ if (!returningWarehouseDetailLists.isEmpty()) {
+ for (ReturningWarehouseDetail returningWarehouseDetail : returningWarehouseDetailLists) {
+ //杩樺師鐗╂枡搴撳瓨鏁�
+ materialInventoryMapper.updateMaterialInventoryAvailableOut(returningWarehouseDetail.getInventoryId(), returningWarehouseDetail.getReturnQuantity());
+ }
+ }
+
materialInventoryMapper.deleteReturningWarehouseDetail(returningId);
materialInventoryMapper.deleteReturningWarehouse(returningId);
materialInventoryMapper.deleteMaterialLog(returningId);
@@ -833,6 +851,29 @@
}
+ public Boolean deleteMaterialInventory(Map<String,Object> object) {
+ String creator = "";
+ if (object.get("creator") != null) {
+ creator = object.get("creator").toString();
+ }
+ String ids = "";
+ if (object.get("ids") != null) {
+ ids = object.get("ids").toString();
+ }
+ List<Long> id=new ArrayList<>();
+ if(!ids.isEmpty()){
+ List<String> result = StrUtil.split(ids, '|');
+ id=result.stream().map(Long::valueOf).collect(Collectors.toList());
+ }
+ materialInventoryMapper.deleteMaterialInventory(id);
+ Log log = new Log();
+ log.setOperator(creator);
+ log.setContent(object.toString());
+ log.setFunction("deleteMaterialInventory锛�"+ids);
+ logService.saveLog(log);
+ return true;
+ }
+
--
Gitblit v1.8.0