From 948194840fc18c00617cbf3cf72f9e81bb0ee5b3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 14 四月 2026 16:50:00 +0800
Subject: [PATCH] 人员考勤调整:导出区分年度和月度
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 2bb2006..19d7e5f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -85,16 +85,27 @@
public class RawMaterialOrderServiceImpl implements RawMaterialOrderService {
private StandardTreeMapper standardTreeMapper;
+
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
+
private UserMapper userMapper;
+
private InsOrderService insOrderService;
+
private InsOrderMapper insOrderMapper;
+
private InsSampleMapper insSampleMapper;
+
private final NumberGenerator<InsOrder> numberGenerator;
+
private InsReportService insReportService;
+
private WechatProperty wechatProperty;
+
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
private InsProductMapper insProductMapper;
+
private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
private IfsApiUtils ifsApiUtils;
@@ -392,7 +403,7 @@
insOrderMapper.updateById(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
insReportService.isRawMaterial(insOrder,true,true);
@@ -487,7 +498,7 @@
insOrderMapper.insert(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
insReportService.isRawMaterial(insOrder,true,true);
@@ -625,7 +636,7 @@
insOrderMapper.updateById(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
return insOrder.getId();
}
--
Gitblit v1.9.3