From 6ed44f32c96a17fd10601a24c3c36ca1229bc89b Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 17 七月 2025 17:18:12 +0800
Subject: [PATCH] 优化货位绑定图片链接保存逻辑，删除不使用的代码
---
models/TN_CG_Detail.cs | 3 +
wms/LocationHelper.cs | 3
api/ErpController.cs | 98 --------------------------------
api/AgvController.cs | 40 -------------
api/ImageController.cs | 6 --
core/WCSCore.cs | 5 -
api/MoboxController.cs | 22 +++---
7 files changed, 19 insertions(+), 158 deletions(-)
diff --git a/api/AgvController.cs b/api/AgvController.cs
index 62bd5cd..68fb832 100644
--- a/api/AgvController.cs
+++ b/api/AgvController.cs
@@ -35,7 +35,6 @@
[Route("orderStatusReport")]
public GzResult orderStatusReport(orderStatusReportParme model) {
//LogHelper.Info("RCS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
- //LogRequestHeaders();
return GZRobot.orderStatusReport(model);
}
@@ -45,14 +44,6 @@
LogHelper.Info("agvRealtimeStateReport锛歊CS鍥借嚜AGV瀹炴椂鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
var res = WCSCore.agvRealtimeStateReport(model);
- //if (res == "offline") {
- // //return NotFound(new EmptyGzResult());
- // return NotFound();
- //}
- //else {
- // //return Ok(new EmptyGzResult());
- // return Ok();
- //}
if (model == null) return NotFound();
if (string.IsNullOrEmpty(res)) {
return BadRequest();
@@ -71,37 +62,6 @@
[Route("safetyInteraction")]
public gzResult SafetyInteraction(SafetyInteractionInfo model) {
return WCSCore.SafetyInteraction(model);
- }
-
- // 鎼佺疆涓嶄娇鐢紝瀛樺湪bug锛欻ttpContext.Current.Request璧嬪�鍓嶅紩鐢紝搴旇鏄疌urrent涓簄ull瀵艰嚧鐨�-
- private void LogRequestHeaders() {
- var request = HttpContext.Current.Request;
- var logMessage = new StringBuilder();
-
- logMessage.AppendLine("=== 璇锋眰澶翠俊鎭�===");
- logMessage.AppendLine($"璇锋眰URL: {request.Url}");
- logMessage.AppendLine($"HTTP鏂规硶: {request.HttpMethod}");
-
- foreach (string headerName in request.Headers) {
- logMessage.AppendLine($"{headerName}: {request.Headers[headerName]}");
- }
-
- LogHelper.Info(logMessage.ToString());
- }
-
- private void LogResponseHeaders() {
- var response = HttpContext.Current.Response;
- var logMessage = new StringBuilder();
-
- logMessage.AppendLine("=== 鍝嶅簲澶翠俊鎭�===");
- logMessage.AppendLine($"鐘舵�鐮� {response.StatusCode}");
-
- foreach (string headerName in response.Headers) {
- logMessage.AppendLine($"{headerName}: {response.Headers[headerName]}");
- }
-
- LogHelper.Info(logMessage.ToString());
}
}
}
diff --git a/api/ErpController.cs b/api/ErpController.cs
index a9d9dbb..02e92a1 100644
--- a/api/ErpController.cs
+++ b/api/ErpController.cs
@@ -23,13 +23,7 @@
[HttpPost]
[Route("InboundDataSync")]
public IHttpActionResult InboundDataSync(InboundDataSyncInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬叆搴撴暟鎹悓姝� + JsonConvert.SerializeObject(model), "API");
-
- //var headers = Request.Headers;
- //var checkRes = CheckHeaders(headers);
- //if (!checkRes.isSuccess) {
- // return CreateErrorResponse(checkRes.code, checkRes.message);
- //}
+ LogHelper.Info("瑙﹀彂API锛欼nboundDataSync锛氬叆搴撴暟鎹悓姝� + JsonConvert.SerializeObject(model), "API");
var res = ApiHelper.InboundDataSync(model);
return CreateSuccessResponse(res);
@@ -43,44 +37,10 @@
[HttpPost]
[Route("OutboundDataSync")]
public IHttpActionResult OutboundDataSync(OutboundDataSyncInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬嚭搴撳彂鏂欏悓姝� + JsonConvert.SerializeObject(model), "API");
-
- //var headers = Request.Headers;
- //var checkRes = CheckHeaders(headers);
- //if (!checkRes.isSuccess) {
- // return CreateErrorResponse(checkRes.code, checkRes.message);
- //}
+ LogHelper.Info("瑙﹀彂API锛歄utboundDataSync锛氬嚭搴撳彂鏂欏悓姝� + JsonConvert.SerializeObject(model), "API");
var res = ApiHelper.OutboundDataSync(model);
return CreateSuccessResponse(res);
- }
-
- private CheckHeadersResult CheckHeaders(System.Net.Http.Headers.HttpRequestHeaders headers) {
- // 蹇呴』瀛楁楠岃瘉
- if (!headers.Contains("sourceAppCode") || !headers.Contains("serviceId") || !headers.Contains("msgSendTime")) {
- return CreateCheckHeadersResult(false, "2003", "缂哄皯蹇呰璇锋眰澶村弬鏁�);
- }
-
- var headerModel = new {
- SourceAppCode = headers.GetValues("sourceAppCode").First(),
- Password = headers.Contains("password") ? headers.GetValues("password").First() : null,
- ServiceId = headers.GetValues("serviceId").First(),
- MsgToken = headers.Contains("msgToken") ? headers.GetValues("msgToken").First() : null,
- MsgSendTime = headers.GetValues("msgSendTime").First()
- };
-
- // 楠岃瘉Header
- var validationResult = ValidateHeaders(headerModel);
- if (validationResult != null) {
- return validationResult;
- }
-
- // 楠岃瘉Body
- if (Request.Content.Headers.ContentLength > 2 * 1024 * 1024) {
- return CreateCheckHeadersResult(false, "2102", "娑堟伅鍐呭杩囬暱锛岃秴杩�M");
- }
-
- return CreateCheckHeadersResult(true);
}
private IHttpActionResult CreateSuccessResponse(object data) {
@@ -89,59 +49,5 @@
Content = new StringContent(JsonConvert.SerializeObject(data), Encoding.UTF8, "application/json")
});
}
-
- private IHttpActionResult CreateErrorResponse(string code, string message) {
- return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {
- Headers = { { "returnCode", code } },
- Content = new StringContent(message)
- });
- }
-
- private CheckHeadersResult ValidateHeaders(dynamic headers) {
- // 瀹炵幇鎵�湁Header楠岃瘉閫昏緫
- if (!IsRegisteredApp(headers.SourceAppCode, headers.Password)) {
- return CreateCheckHeadersResult(false, "2201", "婧愯皟鐢ㄧ郴缁熸湭娉ㄥ唽");
- }
-
- if (!IsValidService(headers.ServiceId)) {
- return CreateCheckHeadersResult(false, "2202", "浠ｇ悊鏈嶅姟鏈敞鍐�);
- }
-
- if (!IsValidDateTime(headers.MsgSendTime)) {
- return CreateCheckHeadersResult(false, "2101", "鏃堕棿鏍煎紡鏍￠獙澶辫触");
- }
-
- if (!string.IsNullOrEmpty(headers.MsgToken) && headers.MsgToken.Length > 32) {
- return CreateCheckHeadersResult(false, "2104", "娑堟伅浠ょ墝杩囬暱锛岃秴杩�2浣�);
- }
-
- return null;
- }
-
- private bool IsRegisteredApp(string appId, string password) {
- return true;
- }
-
- private bool IsValidService(string serviceId) {
- return true;
- }
-
- private bool IsValidDateTime(string dataTime) {
- return true;
- }
-
- private CheckHeadersResult CreateCheckHeadersResult(bool isSuccess, string code = "", string message = "") {
- return new CheckHeadersResult {
- code = code,
- message = message,
- isSuccess = isSuccess
- };
- }
- }
-
- public class CheckHeadersResult {
- public bool isSuccess { get; set; }
- public string code { get; set; }
- public string message { get; set; }
}
}
\ No newline at end of file
diff --git a/api/ImageController.cs b/api/ImageController.cs
index 984dd64..1c20899 100644
--- a/api/ImageController.cs
+++ b/api/ImageController.cs
@@ -6,17 +6,12 @@
using System.Web.Http;
namespace HH.WCS.Mobox3.AnGang.api {
-
- //[RoutePrefix("api/image")]
public class ImageController : ApiController {
- //private readonly string _baseStoragePath = HttpContext.Current.Server.MapPath("~/StaticStorage");
private readonly string _baseStoragePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "StaticStorage");
private readonly string[] _allowedExtensions = { ".jpg", ".jpeg", ".png", ".gif", ".bmp" };
// 涓婁紶鍥剧墖鎺ュ彛
[HttpPost]
- //[ActionName("Upload")]
- //[Route("api/image/upload")]
[Route("UploadImage")]
public HttpResponseMessage UploadImage() {
try {
@@ -72,7 +67,6 @@
// 鑾峰彇鍥剧墖鎺ュ彛 - 瀹為檯鐢遍潤鎬佹枃浠跺鐞嗭紝杩欓噷鍙槸绀轰緥
[HttpGet]
- //[ActionName("Get")]
[Route("static/image/{year}/{month}/{day}/{filename}")]
public HttpResponseMessage GetImage(string year, string month, string day, string filename) {
try {
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index dacb5a9..19faf9b 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -15,14 +15,14 @@
[RoutePrefix("api")]
public class MoboxController : ApiController {
/// <summary>
- /// 璐у搧鍏ュ簱(PDA)
+ /// 璐у搧鍏ュ簱锛堟棫锛� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("Inbound")]
public SimpleResult Inbound(InboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝佸叆搴�PDA)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欼nbound锛氫骇鍝佸叆搴擄紙鏃э級" + JsonConvert.SerializeObject(model), "API");
return ApiHelper.Inbound(model);
}
@@ -34,7 +34,7 @@
[HttpPost]
[Route("InboundData")]
public SimpleResult InboundData(InboundDataInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝佸叆搴�鎵嬪姩娣诲姞鏁版嵁" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欼nboundData锛氫骇鍝佸叆搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.InboundData(model);
}
@@ -46,7 +46,7 @@
[HttpPost]
[Route("PDAFullInArea")]
public SimpleResult SelectLocation(SelectLocationInfo model) {
- LogHelper.Info("瑙﹀彂API锛歅DA閫夋嫨缁堢偣璐т綅" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅DAFullInArea锛歅DA閫夋嫨缁堢偣璐т綅" + JsonConvert.SerializeObject(model), "API");
return ApiHelper.SelectLocation(model);
}
@@ -58,7 +58,7 @@
[HttpPost]
[Route("PartOutbound")]
public SimpleResult PartOutbound(PartOutboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝侀儴鍒嗗嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅artOutbound锛氫骇鍝侀儴鍒嗗嚭搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.PartOutbound(model);
}
@@ -70,7 +70,7 @@
[HttpPost]
[Route("PartInbound")]
public SimpleResult PartInbound(PartInboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氫骇鍝侀儴鍒嗗洖搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛歅artInbound锛氫骇鍝侀儴鍒嗗洖搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.PartInbound(model);
}
@@ -82,7 +82,7 @@
[HttpPost]
[Route("CancelTask")]
public SimpleResult CancelTask(CancelTaskInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欳ancelTask锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CancelTask(model);
}
@@ -96,7 +96,7 @@
[HttpPost]
[Route("CheckOutboundOnce")]
public SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欳heckOutboundOnce锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckOutboundOnce(model);
}
@@ -109,7 +109,7 @@
[HttpPost]
[Route("CountProduct")]
public SimpleResult CountProduct(CountProductInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欳ountProduct锛氱洏鐐圭悊璐� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CountProduct(model);
}
@@ -121,7 +121,7 @@
[HttpPost]
[Route("CheckOutbound")]
public SimpleResult CheckOutbound(CheckOutboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欳heckOutbound锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckOutbound(model);
}
@@ -133,7 +133,7 @@
[HttpPost]
[Route("CheckInbound")]
public SimpleResult CheckInbound(CheckInboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欳heckInbound锛氱洏鐐圭悊璐у洖搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckInbound(model);
}
}
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 9ca3c44..16a7910 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -128,9 +128,8 @@
return;
}
- if (db.Updateable<TN_Loc_Container>()
- .SetColumns(d => d.S_IMG_URL == filepath)
- .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Loc_Container>().SetColumns(d => d.S_IMG_URL == filepath).Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0 &&
+ db.Updateable<TN_CG_Detail>().SetColumns(d => d.S_EXT_ATTR5 == filepath).Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) { // FIX: SNAP
LogHelper.Info($"鍥剧墖URL '{filepath}' 鍐欏叆鏁版嵁搴撳け璐�);
return;
diff --git a/models/TN_CG_Detail.cs b/models/TN_CG_Detail.cs
index 8070826..ca415ca 100644
--- a/models/TN_CG_Detail.cs
+++ b/models/TN_CG_Detail.cs
@@ -96,5 +96,8 @@
///// </summary>
//public string S_INVENTORY_MAN { get; set; }
+ // 淇鍥剧墖瀛樺偍鐨勯闄╋細URL瀛樹竴浠藉埌CGDetail琛ㄧ殑S_EXT_ATTR5涓�+ public string S_EXT_ATTR5 { get; set; } = string.Empty; // FIX: SNAP
+
}
}
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index be96181..6de64e2 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -289,8 +289,7 @@
{
// 琛ュ厖閫昏緫锛氶伩鍏嶈В缁戝鑷寸殑淇℃伅涓㈠け (N_LOCK_STATE涓嶤G_Detail淇濇寔涓�嚧鎵�互鐩存帴璧嬪�灏辫锛汭MGURL璐т綅绉诲姩浜嗗氨鍒犻櫎锛屼篃寰堝悎鐞嗭級
var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == item).First();
- //bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_IMG_URL = "", N_LOCK_STATE = cgDetail?.N_LOCK_STATE ?? 1 });
- bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_IMG_URL = "", N_LOCK_STATE = cgDetail?.N_LOCK_STATE ?? 0 });
+ bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_IMG_URL = cgDetail?.S_EXT_ATTR5 ?? "", N_LOCK_STATE = cgDetail?.N_LOCK_STATE ?? 0 });
}
var log = JsonConvert.SerializeObject(bindLocCntList);
--
Gitblit v1.9.1