From dc7300e21fe53f74e08eb2fa494a83430e2e54ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 26 三月 2026 11:25:58 +0800
Subject: [PATCH] 绩效管理：人员考勤功能模块
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 1a7ce8c..62688d0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -802,7 +802,7 @@
IfsInventoryQuantity one = ifsInventoryQuantityMapper.selectOne(new LambdaQueryWrapper<IfsInventoryQuantity>()
.eq(IfsInventoryQuantity::getId, insOrder.getIfsInventoryId()));
if (Objects.isNull(one)) {
- throw new ErrorException("鎵句笉鍒板師鏉愭枡淇℃伅");
+ throw new ErrorException("鎵句笉鍒伴攢鍞鍗曚俊鎭�");
}
// 鍒ゆ柇鏄惁鏈変笉鍚堟牸淇℃伅
Long count = insUnqualifiedHandlerMapper.selectCount(Wrappers.<InsUnqualifiedHandler>lambdaQuery()
@@ -817,7 +817,7 @@
//濡傛灉鏄媶鍒嗙殑璁㈠崟锛屽垯鎶婃媶鍒嗙殑鎵�鏈夋壒娆￠兘绉诲簱
if(one.getIsSplitOrder()==1 && !hasExemption){
//鏌ヨ鎷嗗垎璁㈠崟璇︽儏
- List<IfsInventoryQuantityVO> ifsInventoryQuantityVOS = ifsInventoryQuantityMapper.selectSplitOrderList(one.getPartNo(), one.getLineNo(), one.getReleaseNo(), one.getReceiptNo(), one.getOrderNo());
+ List<IfsInventoryQuantityVO> ifsInventoryQuantityVOS = ifsInventoryQuantityMapper.selectSplitOrderList(one.getPartNo(), one.getLineNo(), one.getReleaseNo(), one.getReceiptNo(), one.getOrderNo(),one.getContract());
for (IfsInventoryQuantityVO vo : ifsInventoryQuantityVOS) {
//濡傛灉鏈夊鎵樺崟淇℃伅涓斿悎鏍硷紝璧扮櫥璁板悗绉诲簱锛涘鏋滄病鏈夛紝鍒欒蛋鍏嶆锛涗笉鍚堟牸涓嶅仛澶勭悊
if(Objects.isNull(vo.getInsOrderId())){
@@ -860,6 +860,7 @@
// 浼佷笟寰俊閫氱煡
String message = "";
message += "妫�娴嬬粨鏋滄彁浜ら�氱煡";
+ message += "\nIFS鍩�: " + one.getContract();
message += "\n鎵规鍙�: " + one.getUpdateBatchNo();
message += "\n闆朵欢鍙�: " + one.getPartNo();
message += "\n闆朵欢鎻忚堪: " + one.getPartDesc();
@@ -875,8 +876,6 @@
});
}
-
-
}
/**
--
Gitblit v1.9.3