Merge remote-tracking branch 'origin/master'

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()));
 			}

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;
         }
         // 完成工序