From b0688c1efd606284fd5bc31f2d60a1fec9aef968 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 08 四月 2025 11:20:50 +0800
Subject: [PATCH] 自定义菜单优化
---
WebAPI/Controllers/基础资料/基础资料/Gy_SOPBillEditController.cs | 150 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 138 insertions(+), 12 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 b022291..9a84f8b 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"
@@ -27,7 +27,9 @@
public DAL.ClsGy_SOPBill BillOld = new DAL.ClsGy_SOPBill();
public bool BillChange; //
public DataGridView grdMain = new System.Windows.Forms.DataGridView();
- ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
//瀹氫箟
public const Int16 HTagCol = 0;
@@ -241,6 +243,93 @@
}
}
#endregion
+
+ #region 淇濆瓨鍗曟嵁
+ [Route("Gy_SOPBill/Save")]
+ [HttpPost]
+ public object Save([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msgMain = sArray[0].ToString(); //琛ㄥご淇℃伅
+ string msgSub = sArray[1].ToString(); //琛ㄤ綋淇℃伅
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷
+ string user = sArray[3].ToString(); //鐢ㄦ埛
+ DBUtility.ClsPub.CurUserName = user;
+
+ ListModels oListModels = new ListModels();
+ DAL.ClsGy_SOPBill oBill = new DAL.ClsGy_SOPBill();
+ List<Model.ClsGy_SOPBillMain> lsmain = new List<Model.ClsGy_SOPBillMain>();
+ msgMain = msgMain.Replace("\\", "");
+ msgMain = msgMain.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_SOPBillMain(msgMain);
+ foreach (Model.ClsGy_SOPBillMain oItem in lsmain)
+ {
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msgSub = msgSub.Substring(1, msgSub.Length - 2);
+ msgSub = msgSub.Replace("\\", "");
+ msgSub = msgSub.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsGy_SOPBillSub> ls = new List<Model.ClsGy_SOPBillSub>();
+ ls = oListModels.getObjectByJson_Gy_SOPBillSub(msgSub);
+ int i = 0;
+ foreach (Model.ClsGy_SOPBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (OperationType == "1" || OperationType == "2")
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
[Route("Gy_SOPBill/Use")]
[HttpGet]
public object sy_Click()
@@ -289,12 +378,23 @@
[HttpPost]
public object UploadFile1()
{
-
+ string path="";
string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
- string HInterID = HttpContext.Current.Request.Params["HInterID"]; //鍒涘缓浜�
- HttpPostedFile files = HttpContext.Current.Request.Files["file"]; //鍗曟嵁涓诲唴鐮�
- string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
+ string HInterID = HttpContext.Current.Request.Params["HInterID"]; //鍗曟嵁鍐呯爜
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"]; //鏂囦欢
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ {
+ path = "D:/缃戠珯鍙戝竷/MES/MES娴嬭瘯/LAYUI/Files/SOP/" + HBillNo;
+ }
+ else
+ {
+ path = HttpContext.Current.Server.MapPath("~/../Files/SOP/" + HBillNo);
+ }
+ }
//string path = @"D:\\Files\\"+ HBillNo;
Int64 HEntryID = Convert.ToInt64(HttpContext.Current.Request.Params["HEntryID"]); //瀛愬唴鐮�
dynamic dyResult = UpLoadFile(files, path, HBillNo, HInterID, HUserName, HEntryID);
@@ -313,8 +413,7 @@
objJsonResult.Message = dyResult.returnval;
objJsonResult.data = null;
return objJsonResult;
- }
-
+ }
}
public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HInterID, string HUserName,Int64 HEntryID)
@@ -371,7 +470,20 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "";
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ {
+ StrPath = "D:/缃戠珯鍙戝竷/MES/MES娴嬭瘯/LAYUI/Files/SOP/" + HBillNo + "/" + filename;
+ }
+ else
+ {
+ StrPath = "/files/SOP/" + HBillNo + "/" + filename;
+ }
+ }
+
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -379,7 +491,7 @@
oCN.RunProc("Insert into Gy_SOPBillSub2 (HFileName,HPath,HFileType" +
",HUpMan,HUpTime,HInterID,HEntryID,HSno,HFileID,HFileSize" +
") values('"
- + filename.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + fileExtension.ToString() + "'" +
",'" + HUserName + "',getdate()" + ",'" + HInterID + "','" + HEntryID + "','" + Sno + "','" + lID + "','" + filesize +
"') ");
}
@@ -391,8 +503,22 @@
else
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
- files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ files.SaveAs(fileurl);
+ string StrPath = "";
+ string Ret = "";
+ //if (oSystemParameter.ShowBill(ref Ret))
+ //{
+ // if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ // {
+ // StrPath = "D:/缃戠珯鍙戝竷/MES/MES娴嬭瘯/LAYUI/Files/SOP/" + HBillNo + "/" + filename;
+ // }
+ // else
+ // {
+ // StrPath = "/files/SOP/" + HBillNo + "/" + filename;
+ // }
+ //}
+ StrPath = "/files/SOP/" + HBillNo + "/" + filename;
+
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -400,7 +526,7 @@
oCN.RunProc("Insert into Gy_SOPBillSub2 (HFileName,HPath,HFileType" +
",HUpMan,HUpTime,HInterID,HEntryID,HSno,HFileID,HFileSize" +
") values('"
- + filename.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + fileExtension.ToString() + "'" +
",'" + HUserName + "',getdate()" + ",'" + HInterID + "','" + HEntryID + "','" + Sno + "','" + lID + "','" + filesize +
"') ");
}
--
Gitblit v1.9.1