From 8c7d0e365d20f5f7d05e59afc1c39daeb0dfd690 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 05 十二月 2024 13:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 2580f9c..93e8a5a 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1950,7 +1950,7 @@
string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
HttpPostedFile files = HttpContext.Current.Request.Files["file"];
- string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HBillNo);
//string path = @"D:\\Files\\"+ HBillNo;
dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
@@ -2006,7 +2006,7 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/"+ HBillNo+"/"+ filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo+"/"+ filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -2029,7 +2029,7 @@
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -2070,7 +2070,7 @@
string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
HttpPostedFile files = HttpContext.Current.Request.Files["file"];
- string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HBillNo);
//string path = @"D:\\Files\\"+ HBillNo;
dynamic dyResult = UpLoadFile1(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
@@ -2126,7 +2126,7 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -2149,7 +2149,7 @@
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
files.SaveAs(fileurl);
- string StrPath = "/files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/Cj_StationOutBill/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -2199,7 +2199,7 @@
[HttpGet]
public object Filelist(string HBillNo)
{
- var url = fileip + "/files/" + HBillNo+"/";
+ var url = fileip + "/files/Cj_StationOutBill/" + HBillNo+"/";
//@"C:\\files\\"
try
{
@@ -2234,7 +2234,7 @@
{
oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
- string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/" + HSourceBillNo), HFileName);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Cj_StationOutBill/" + HSourceBillNo), HFileName);
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1