From cf3bf382a85dcace9247e1103b250d1f3bc5104c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 06 八月 2021 13:47:08 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 0bb2bce..727a50f 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -22,13 +22,13 @@
DataSet ds;
DataSet ds1;
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
-
- /// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Cj_StationOutBill/AddBill")]
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationOutBill/AddBill")]
[HttpPost]
public object AddBill([FromBody] JObject oMain)
{
@@ -390,9 +390,9 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Cj_StationOutBill/list")]
+ [Route("Cj_StationOutBill/get_Display")]
[HttpGet]
- public object list(string sWhere)
+ public object get_Display(string sWhere)
{
try
{
@@ -499,7 +499,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�";
+ objJsonResult.Message = dyResult.returnval;
objJsonResult.data = null;
return objJsonResult;
}
@@ -540,7 +540,7 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/Files/"+ HBillNo+"/"+ filename;
+ string StrPath = "/files/"+ HBillNo+"/"+ filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -563,7 +563,7 @@
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
files.SaveAs(fileurl);
- string StrPath = "/Files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -613,10 +613,11 @@
[HttpGet]
public object Filelist(string HBillNo)
{
- var url = fileip + "/Files/" + HBillNo+"/";
+ var url = fileip + "/files/" + HBillNo+"/";
+ //@"C:\\files\\"
try
{
- ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo=" + HBillNo, "MES_AccessoriesList");
+ ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo+"'", "MES_AccessoriesList");
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -645,8 +646,8 @@
{
try
{
-
- ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HItemID ='" + HItemID + "'", "MES_AccessoriesList");
+
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/" + HSourceBillNo), HFileName);
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
objJsonResult.code = "1";
@@ -654,7 +655,6 @@
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
-
}
catch (Exception e)
{
--
Gitblit v1.9.1