From 08394a65cb0c63068ea93e3ba1a15d23ed25e435 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 18 六月 2021 13:38:21 +0800
Subject: [PATCH] nothing
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 130 +++++++++++++++++++++---------------------
WebAPI/Web.config | 3
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 29 +++++----
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs | 2
4 files changed, 84 insertions(+), 80 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs b/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
index 465de7c..770ff1e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
@@ -9,7 +9,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
- public class Gy_DepartmentController : ApiController
+ public class Gy_StockPlaceController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 38726d4..cc304cb 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)
{
@@ -484,7 +484,10 @@
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/" + HBillNo);
+ //string path = @"C:\\files\\" + HBillNo;
+ //string path = HttpContext.Current.Server.MapPath(filePath + HBillNo);
+ //filePath
dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
{
@@ -539,7 +542,7 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/Files/"+ HBillNo+"/"+ filename;
+ string StrPath = "/files/"+ HBillNo+"/"+ filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -562,7 +565,7 @@
{
Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
files.SaveAs(fileurl);
- string StrPath = "/Files/" + HBillNo + "/" + filename;
+ string StrPath = "/files/" + HBillNo + "/" + filename;
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -612,10 +615,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锛�";
@@ -653,7 +657,6 @@
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
-
}
catch (Exception e)
{
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7020126..f54238c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,19 +18,19 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
<publishTime>03/18/2015 17:02:50</publishTime>
@@ -42,19 +42,19 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>05/31/2021 09:54:31</publishTime>
+ <publishTime>05/20/2021 17:29:58</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/21/2020 10:51:50</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -120,7 +120,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -153,10 +153,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/17/2021 11:17:34</publishTime>
+ <publishTime>06/18/2021 12:46:39</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/17/2021 11:17:34</publishTime>
+ <publishTime>06/18/2021 12:46:39</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -168,163 +168,163 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/31/2021 09:54:31</publishTime>
+ <publishTime>05/20/2021 17:29:58</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/21/2020 10:51:50</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/21/2021 13:19:40</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/17/2021 11:17:42</publishTime>
+ <publishTime>06/18/2021 12:46:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 63ef17c..4be5306 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -17,7 +17,8 @@
<appSettings>
<!--鏈嶅姟鍣ㄦ枃浠禝P鍦板潃-->
- <add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>
+ <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
+ <add key="FileIP" value="http://localhost:8085/"/>
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
--
Gitblit v1.9.1