From d9d66b51a9643194ce2b29053a3fc187eb7bdaf1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 13 十月 2023 11:12:20 +0800
Subject: [PATCH] 作业指导书，异常反馈单
---
WebAPI/Controllers/基础资料/基础资料/Gy_SOPBillEditController.cs | 9 +++++----
WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs | 3 +++
WebAPI/DLL/ClsOA_ErrMsgBackBill.cs | 3 ++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEditController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEditController.cs"
index bea0792..b022291 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEditController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEditController.cs"
@@ -296,7 +296,8 @@
HttpPostedFile files = HttpContext.Current.Request.Files["file"]; //鍗曟嵁涓诲唴鐮�
string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
//string path = @"D:\\Files\\"+ HBillNo;
- dynamic dyResult = UpLoadFile(files, path, HBillNo, HInterID, HUserName);
+ Int64 HEntryID = Convert.ToInt64(HttpContext.Current.Request.Params["HEntryID"]); //瀛愬唴鐮�
+ dynamic dyResult = UpLoadFile(files, path, HBillNo, HInterID, HUserName, HEntryID);
if (dyResult != null && dyResult.result == 1)
{
objJsonResult.code = "1";
@@ -316,7 +317,7 @@
}
- public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HInterID, string HUserName)
+ public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HInterID, string HUserName,Int64 HEntryID)
{
dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
@@ -379,7 +380,7 @@
",HUpMan,HUpTime,HInterID,HEntryID,HSno,HFileID,HFileSize" +
") values('"
+ filename.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
- ",'" + HUserName + "',getdate()" + ",'" + HInterID + "','" + 0 + "','" + Sno + "','" + lID + "','" + 0 +
+ ",'" + HUserName + "',getdate()" + ",'" + HInterID + "','" + HEntryID + "','" + Sno + "','" + lID + "','" + filesize +
"') ");
}
else
@@ -400,7 +401,7 @@
",HUpMan,HUpTime,HInterID,HEntryID,HSno,HFileID,HFileSize" +
") values('"
+ filename.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
- ",'" + HUserName + "',getdate()" + ",'" + HInterID + "','" + 222 + "','" + 333 + "','" + 444 + "','" + 555 +
+ ",'" + HUserName + "',getdate()" + ",'" + HInterID + "','" + HEntryID + "','" + Sno + "','" + lID + "','" + filesize +
"') ");
}
else
diff --git a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
index a0b3b11..6802e1b 100644
--- a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
+++ b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
@@ -134,7 +134,7 @@
",HContext,HDeptID,HDescription,HSendMan,HReceiveMan" +
",HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName"+
",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType"+
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRecDeptID,HMaterNumber" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
@@ -142,6 +142,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 + "'" +
") ");
//鎻掑叆瀛愯〃
//foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
diff --git a/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs b/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
index 1eebf79..cb3b1a2 100644
--- a/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
+++ b/WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs
@@ -22,5 +22,8 @@
public string HMaterModel;// varchar(100) --规格型号
public double HQty;// money --数量
public string HSendType;// varchar(6) --发送类型（公共，个人）
+
+ public string HMaterNumber;// varchar(100) 物料编码
+ public Int64 HRecDeptID;// int --接收部门
}
}
--
Gitblit v1.9.1