From 67b2d078a807c77051767d9d2cca4f5194213bb4 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 18 六月 2024 19:40:24 +0800
Subject: [PATCH] 网页版： 异常反馈单 表头增加 字段 HHandleEmpID int --指派处理人（Gy_Employee） 这个字段 在 新增和修改 反馈单时 ，不可编辑； 当异常反馈接收单 保存时，根据源单 将 反馈接收单 的 指派处理人 更新至 异常反馈单 里。
---
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user | 36 ++++++++++++++++++------------------
DAL/信息平台/ClsOA_ErrMsgBackReceiveBill.cs | 3 +++
WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs | 2 ++
WebAPI/DLL/ClsOA_ErrMsgBackBill.cs | 5 +++--
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 6 ++++--
5 files changed, 30 insertions(+), 22 deletions(-)
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs"
index 78938e4..e00caa9 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs"
@@ -189,6 +189,9 @@
//涓昏〃
oCn.RunProc(sql);
+ //鍙嶉鎺ユ敹鍗曚繚瀛樺悗,鏇存柊寮傚父鍙嶉鍗曠殑鎸囨淳澶勭悊浜�
+ string sql1 = "update OA_ErrMsgBackBillMain set HHandleEmpID='" + omodel.HHandleEmpID.ToString() + "' where HBillNo='" + omodel.HMainSourceBillNo + "' ";
+ oCn.RunProc(sql1);
//=========================淇濆瓨鍚庢帶鍒�
DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl");
if (ds2 == null)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 89983c8..66a1b09 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -396,7 +396,7 @@
if (sWhere == null || sWhere.Equals(""))
{
string sql = "select * from h_v_OA_ErrMsgBackBillList order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "p_v_OA_ErrMsgBackBillList");
+ ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillList");
}
else
{
@@ -518,10 +518,12 @@
A.HReceiveMan,A.HCopyMan,A.HHasten,
A.HLevel,A.HMaterName,A.HMaterModel,
B.HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate,A.HChecker,A.HCheckDate,A.HCloseMan,A.HCloseDate,A.HDeleteMan,A.HDeleteDate,
- A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType
+ A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType,
+ A.HHandleEmpID,f.HName HHandleEmpName
from OA_ErrMsgBackBillMain A
inner join OA_ErrMsgBackBillSub2 B on A.HInterID=B.HInterID
left join Gy_Department D on A.HDeptID=D.HItemID
+ left join Gy_Employee f on A.HHandleEmpID=f.HItemID
where A.HInterID='" + HID + "' and b.HEntryID='" + HEntryID + "'");
var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
diff --git a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
index 397b06f..42bf431 100644
--- a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
+++ b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
@@ -67,6 +67,7 @@
",HQty=" + omodel.HQty.ToString() +
",HRecDeptID=" + omodel.HRecDeptID.ToString() +
",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ ",HHandleEmpID=" + omodel.HHandleEmpID.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -137,7 +138,7 @@
",HContext,HDeptID,HDescription,HSendMan,HReceiveMan" +
",HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName"+
",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType"+
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRecDeptID,HMaterNumber,HErrMsgBackTypeID" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRecDeptID,HMaterNumber,HErrMsgBackTypeID,HHandleEmpID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
@@ -145,7 +146,7 @@
",'" + omodel.HCopyMan + "'," + omodel.HHasten.ToString() + ",'" + omodel.HLevel + "','" + omodel.HReTransmitMan + "','" + omodel.HBillTypeName + "'" +
",'" + omodel.HPlanBillNo + "','" + omodel.HMaterName + "','" + omodel.HMaterModel + "'," + omodel.HQty.ToString() + ",'" + omodel.HSendType + "'" +
",'" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
- "," + omodel.HRecDeptID + ",'" + omodel.HMaterNumber + "'," + omodel.HErrMsgBackTypeID +
+ "," + omodel.HRecDeptID + ",'" + omodel.HMaterNumber + "'," + omodel.HErrMsgBackTypeID +", " + omodel.HHandleEmpID +
") ");
//鎻掑叆瀛愯〃
//foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
diff --git a/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs b/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
index 885dea0..98be88a 100644
--- a/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
+++ b/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
@@ -27,5 +27,7 @@
public Int64 HRecDeptID;// int --接收部门
public Int64 HErrMsgBackTypeID; //异常类型
+
+ public Int64 HHandleEmpID; //指派处理人
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
index c4bdfa9..79c6e56 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-06-17T05:22:25.8401219Z;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
+ <History>True|2024-06-18T08:08:52.3066991Z;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/17/2024 13:22:14</publishTime>
+ <publishTime>06/18/2024 16:08:23</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/17/2024 13:22:14</publishTime>
+ <publishTime>06/18/2024 16:08:23</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/17/2024 13:22:13</publishTime>
+ <publishTime>06/18/2024 16:08:22</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/17/2024 13:22:13</publishTime>
+ <publishTime>06/18/2024 16:08:22</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/17/2024 13:22:10</publishTime>
+ <publishTime>06/18/2024 16:08:19</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/17/2024 13:22:10</publishTime>
+ <publishTime>06/18/2024 16:08:19</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -84,10 +84,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/17/2024 13:22:11</publishTime>
+ <publishTime>06/18/2024 16:08:20</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/17/2024 13:22:11</publishTime>
+ <publishTime>06/18/2024 16:08:20</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -120,25 +120,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/17/2024 13:22:09</publishTime>
+ <publishTime>06/18/2024 16:08:17</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/17/2024 13:22:09</publishTime>
+ <publishTime>06/18/2024 16:08:17</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/17/2024 13:22:10</publishTime>
+ <publishTime>06/18/2024 16:08:19</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/17/2024 13:22:10</publishTime>
+ <publishTime>06/18/2024 16:08:19</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/17/2024 13:22:10</publishTime>
+ <publishTime>06/18/2024 16:08:19</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/17/2024 13:22:10</publishTime>
+ <publishTime>06/18/2024 16:08:19</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,10 +246,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/17/2024 13:22:18</publishTime>
+ <publishTime>06/18/2024 16:08:27</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/17/2024 13:22:18</publishTime>
+ <publishTime>06/18/2024 16:08:27</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -444,7 +444,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/17/2024 13:22:24</publishTime>
+ <publishTime>06/18/2024 16:08:51</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1