From e68146ee161e19f29b5e47cb284939e4946d1d7f Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 2 Jun 2026 09:55:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/cost/controller/CostCalculationEmployeeController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java
index e41d6b593..8fc7d2ef2 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java
@@ -196,7 +196,7 @@ public class CostCalculationEmployeeController extends BladeController {
 		List<CostCalculationEmployeeEntity> list = new ArrayList<>();
 		for(CostCalculationEmployeeExcel employExcel : importList){
 			//根据员工编号查询，有则删除
-			CostCalculationEmployeeEntity old = costCalculationEmployeeService.getOne(Wrappers.<CostCalculationEmployeeEntity>lambdaQuery().eq(CostCalculationEmployeeEntity::getEmployeeCode,employExcel.getEmployeeCode()));
+			CostCalculationEmployeeEntity old = costCalculationEmployeeService.getOne(Wrappers.<CostCalculationEmployeeEntity>lambdaQuery().eq(CostCalculationEmployeeEntity::getEmployeeCode,employExcel.getEmployeeCode()).eq(CostCalculationEmployeeEntity::getWorkCenterName,employExcel.getWorkCenterName()));
 			if(old != null){
 				costCalculationEmployeeService.deleteLogic(Func.toLongList(old.getId().toString()));
 			}

From 72a67e2d1c2bf255be5107f9ac8f5e462116f033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Tue, 2 Jun 2026 10:05:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/service/impl/WorkOrderServiceImpl.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 3e4683967..4c62270ed 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -2037,7 +2037,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public void oemHandle(Long nextWpId, int type) {
         // 接收工序
         WorkPlan workPlan = workPlanService.getById(nextWpId);
-        if (workPlan != null && !"1".equals(workPlan.getOem())) {
+        if (workPlan == null || !"1".equals(workPlan.getOem())) {
             return;
         }
         // 完成工序