From 854856127101ea6cbbc261db46cb06ac141d6ab0 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
index 22c39b9..668ff5a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
@@ -125,13 +125,13 @@
orderActualMaterial.setEquipmentId(equipmentId);
maintenanceOrderActualMaterialService.save(orderActualMaterial);
//鏇存柊鍑哄簱鍗曠殑鍙娇鐢ㄦ暟閲�
- List<SparePartOutboundDetail> sparePartOutboundDetailList = sparePartOutboundDetailService.lambdaQuery().eq(SparePartOutboundDetail::getSparePartOutboundId,orderActualMaterial.getOutboundOrderId())
- .eq(SparePartOutboundDetail::getSparePartId,orderActualMaterial.getSparePartId()).eq(SparePartOutboundDetail::getDelFlag, CommonConstant.DEL_FLAG_0).list();
- if(CollectionUtils.isNotEmpty(sparePartOutboundDetailList)){
- SparePartOutboundDetail sparePartOutboundDetail = sparePartOutboundDetailList.get(0);
- sparePartOutboundDetail.setUseQuantity(orderActualMaterial.getQuantity());
- sparePartOutboundDetailService.updateById(sparePartOutboundDetail);
- }
+// List<SparePartOutboundDetail> sparePartOutboundDetailList = sparePartOutboundDetailService.lambdaQuery().eq(SparePartOutboundDetail::getSparePartOutboundId,orderActualMaterial.getOutboundOrderId())
+// .eq(SparePartOutboundDetail::getSparePartId,orderActualMaterial.getSparePartId()).eq(SparePartOutboundDetail::getDelFlag, CommonConstant.DEL_FLAG_0).list();
+// if(CollectionUtils.isNotEmpty(sparePartOutboundDetailList)){
+// SparePartOutboundDetail sparePartOutboundDetail = sparePartOutboundDetailList.get(0);
+// sparePartOutboundDetail.setUseQuantity(orderActualMaterial.getQuantity());
+// sparePartOutboundDetailService.updateById(sparePartOutboundDetail);
+// }
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3