From fa61fd1b6e892f055656c3232e8cf643d3658002 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 28 三月 2025 17:36:22 +0800
Subject: [PATCH] 项目费用分类 的基础资料编辑及列表 管径、管径材质 的 基础资料 项目费用 里 增加 项目费用分类和 金额HStdMoney 的字段 异常反馈验收单，班次开班单，员工技能矩阵，工序流转卡维护，设备开机单 ：增加 系统参数（参考 开工单，采购订单，采购入库单 之类的 ）保存后自动审核； 如果 系统参数 为 Y，则 自动审核； 如果否 则 不审核；
---
WebAPI/Controllers/工资管理/HR_EmployeeSkillBillController.cs | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/HR_EmployeeSkillBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/HR_EmployeeSkillBillController.cs"
index 5815a56..dc72b94 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/HR_EmployeeSkillBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/HR_EmployeeSkillBillController.cs"
@@ -29,8 +29,8 @@
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public DAL.ClsHR_EmployeeSkillBill oBill = new DAL.ClsHR_EmployeeSkillBill();
public DAL.ClsHR_EmployeeSkillBill BillNew = new DAL.ClsHR_EmployeeSkillBill(); //瀵瑰簲鍗曟嵁绫�
- public DAL.ClsHR_EmployeeSkillBill BillOld = new DAL.ClsHR_EmployeeSkillBill(); //瀵瑰簲鍗曟嵁绫�
-
+ public DAL.ClsHR_EmployeeSkillBill BillOld = new DAL.ClsHR_EmployeeSkillBill(); //瀵瑰簲鍗曟嵁绫�
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); //鑾峰彇绯荤粺鍙傛暟
// HR_EmployeeSkillBill HR_EmployeeSkillBillMain
#region 鍛樺伐鎶�鑳芥竻鍗曞垪琛�
/// <summary>
@@ -833,7 +833,32 @@
bResult = false;
}
if (bResult)
- {
+ {
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.HR_EmployeeSkillBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -848,6 +873,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
+
}
catch (Exception e)
{
--
Gitblit v1.9.1