From c8f338feee0b6003d8f069b1d37fd9b90dd1b7f4 Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期一, 07 七月 2025 17:31:38 +0800
Subject: [PATCH] 印尼佳通优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/WmsController.cs | 116 +++++++++++++++++++++-------------------------------------
1 files changed, 42 insertions(+), 74 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/WmsController.cs
index 1d874e5..d2a4ece 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/WmsController.cs
@@ -55,18 +55,19 @@
}
/// <summary>
- /// 3.鎴愬瀷鏈哄彨鏂欏嚭搴撲换鍔�+ /// 3.鍙枡鍑哄簱浠诲姟
/// 涓氬姟鍦烘櫙锛� /// 1.鎴愬瀷鏈哄懠鍙祦绋嬶紙甯︽潫/闆跺害 銆佽儙渚�銆丅EC銆佸唴琛�甯樺竷銆佽儙鍦�涓夎鑳讹級
+ /// 2.鎶芥鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public ReturnResult createOutOrder(CreateOutOrderModel model)
{
- LogHelper.Info("銆�.鎴愬瀷鏈哄彨鏂欏嚭搴撲换鍔°�request锛� + JsonConvert.SerializeObject(model), "WMS");
+ LogHelper.Info("銆�.鍙枡鍑哄簱浠诲姟銆憆equest锛� + JsonConvert.SerializeObject(model), "WMS");
var result = ApiHelper.createOutOrder(model);
- LogHelper.Info("銆�.鎴愬瀷鏈哄彨鏂欏嚭搴撲换鍔°�response锛� + JsonConvert.SerializeObject(result), "WMS");
+ LogHelper.Info("銆�.鍙枡鍑哄簱浠诲姟銆憆esponse锛� + JsonConvert.SerializeObject(result), "WMS");
return result;
}
@@ -126,7 +127,7 @@
LogHelper.Info("銆�.涓嬪彂姣嶆嫋鍑哄叆搴撲换鍔°�response锛� + JsonConvert.SerializeObject(result), "WMS");
return result;
}
-
+
// ------------------- WCS ----------------
/// <summary>
@@ -144,22 +145,6 @@
LogHelper.Info("銆�.WCS浠诲姟鐘舵�鍙嶉銆憆esponse锛� + JsonConvert.SerializeObject(result), "WMS");
return result;
}
-
- /*/// <summary>
- /// 8.WCS鍏ュ簱璇荤爜鍙嶉
- /// 涓氬姟鍦烘櫙锛歐CS鍦ㄦ墽琛屼换鍔℃椂锛屽洖鎶ヤ换鍔＄姸鎬�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- *//*[Route("notifyTaskStatus")]*//*
- public ReturnResult readCodeFeedback(ReadCodeFeedbackModel model)
- {
- LogHelper.Info("銆�.WCS鍏ュ簱璇荤爜鍙嶉銆慠equest锛� + JsonConvert.SerializeObject(model), "WMS");
- var result = ApiHelper.readCodeFeedback(model);
- LogHelper.Info("銆�.WCS鍏ュ簱璇荤爜鍙嶉銆憆esponse锛� + JsonConvert.SerializeObject(result), "WMS");
- return result;
- }*/
/// <summary>
/// 8.WCS鍙嶉璐т綅鐘舵�
@@ -181,14 +166,6 @@
return result;
}
- public class LocStateFeedBackModel
- {
- public string reqId { get; set; }
- public string reqTime { get; set; }
- public string loc_code { get; set; } // 绔欏彴缂栫爜
- public string type { get; set; } // 璇锋眰绫诲瀷 1 鍏佽鍙栬揣 2 鍏佽鏀捐揣
- public string req_no { get; set; } // 浠诲姟鍙�- }
// ----------------------------------- GT --------------------------------------------------------------
@@ -209,65 +186,48 @@
}
/// <summary>
- /// 10.鍚屾鏇存柊鐗╂枡鐘舵�
- /// 涓氬姟鍦烘櫙锛欸T鐨勭姸鎬佽繘琛屾洿鏂帮紝wms涔熼渶瑕佸悓姝ユ洿鏂�+ /// 10.鍚屾鏉＄爜鐘舵�淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
/*[Route("notifyTaskStatus")]*/
- public ReturnResult synUpdateMatlStatus(SynUpdateMatlStatusModel model)
+ public ReturnResult synBarcodeStatus(SynUpdateMatlStatusModel model)
{
- LogHelper.Info("銆�0.鍚屾鏇存柊鐗╂枡鐘舵�銆慠equest锛� + JsonConvert.SerializeObject(model), "GT");
- var result = ApiHelper.synUpdateMatlStatus(model.updateMatlStatuses);
- LogHelper.Info("銆�0.鍚屾鏇存柊鐗╂枡鐘舵�銆憆esponse锛� + JsonConvert.SerializeObject(result), "GT");
+ LogHelper.Info("銆�0.鍚屾鏉＄爜鐘舵�琛ㄤ俊鎭�Request锛� + JsonConvert.SerializeObject(model), "GT");
+ var result = ApiHelper.synBarcodeStatus(model.updateMatlStatuses);
+ LogHelper.Info("銆�0.鍚屾鏉＄爜鐘舵�琛ㄤ俊鎭�response锛� + JsonConvert.SerializeObject(result), "GT");
return result;
}
/// <summary>
- /// 11.璁板綍鏁版嵁鍚屾鏃堕棿
+ /// 11.鍚屾鎶芥鐘舵�琛ㄤ俊鎭�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ /*[Route("notifyTaskStatus")]*/
+ public ReturnResult synSamplingStatus(SynUpdateMatlStatusModel model)
+ {
+ LogHelper.Info("銆�1.鍚屾鎶芥鐘舵�琛ㄤ俊鎭�Request锛� + JsonConvert.SerializeObject(model), "GT");
+ var result = ApiHelper.synSamplingStatus(model.updateMatlStatuses);
+ LogHelper.Info("銆�1.鍚屾鎶芥鐘舵�琛ㄤ俊鎭�response锛� + JsonConvert.SerializeObject(result), "GT");
+ return result;
+ }
+
+ /// <summary>
+ /// 11.鏌ヨ涓棿琛ㄦ渶鍚庣殑鍚屾鏃堕棿
/// 涓氬姟鍦烘櫙锛氳褰曠墿鏂欐潯鐮佷俊鎭悓姝ャ�鐗╂枡鐘舵�淇℃伅鍚屾鏃堕棿
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
/*[Route("notifyTaskStatus")]*/
- public ReturnResult recordDataSynTime(RecordDataSynTimeModel model)
+ public ReturnResult findDataLastSynTime(SynTableModel model)
{
- LogHelper.Info("銆�1.璁板綍鏁版嵁鍚屾鏃堕棿銆慠equest锛� + JsonConvert.SerializeObject(model), "GT");
- var result = ApiHelper.recordDataSynTime(model);
- LogHelper.Info("銆�1.璁板綍鏁版嵁鍚屾鏃堕棿銆憆esponse锛� + JsonConvert.SerializeObject(result), "GT");
- return result;
- }
-
- /// <summary>
- /// 12.鏌ヨ涓婁竴娆＄殑鏁版嵁鍚屾鏃堕棿
- /// 涓氬姟鍦烘櫙锛氳褰曠墿鏂欐潯鐮佷俊鎭悓姝ャ�鐗╂枡鐘舵�淇℃伅鍚屾鏃堕棿
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- /*[Route("notifyTaskStatus")]*/
- public ReturnResult findLastDataSynTime(RecordDataSynTimeModel model)
- {
- LogHelper.Info("銆�2.鏌ヨ涓婁竴娆＄殑鏁版嵁鍚屾鏃堕棿銆慠equest锛� + JsonConvert.SerializeObject(model), "GT");
- var result = ApiHelper.findLastDataSynTime(model.recordTable);
- LogHelper.Info("銆�2.鏌ヨ涓婁竴娆＄殑鏁版嵁鍚屾鏃堕棿銆憆esponse锛� + JsonConvert.SerializeObject(result), "GT");
- return result;
- }
-
- /// <summary>
- /// 13.鍚屾鏇存柊鐗╂枡瀛樻斁鏃堕棿閰嶇疆琛�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- /*[Route("notifyTaskStatus")]*/
- public ReturnResult synUpdateMatlTimeConfig(MatlTimeConfigModel model)
- {
- LogHelper.Info("銆�3.鍚屾鏇存柊鐗╂枡瀛樻斁鏃堕棿閰嶇疆琛ㄣ�Request锛� + JsonConvert.SerializeObject(model), "GT");
- var result = ApiHelper.synUpdateMatlTimeConfig(model.overages);
- LogHelper.Info("銆�3.鍚屾鏇存柊鐗╂枡瀛樻斁鏃堕棿閰嶇疆琛ㄣ�response锛� + JsonConvert.SerializeObject(result), "GT");
+ LogHelper.Info("銆�1.鏌ヨ涓婁竴娆＄殑鏁版嵁鍚屾鏃堕棿銆慠equest锛� + JsonConvert.SerializeObject(model), "GT");
+ var result = ApiHelper.findDataLastSynTime(model.tableType);
+ LogHelper.Info("銆�1.鏌ヨ涓婁竴娆＄殑鏁版嵁鍚屾鏃堕棿銆憆esponse锛� + JsonConvert.SerializeObject(result), "GT");
return result;
}
@@ -287,12 +247,18 @@
public string last_modify_time { get; set; }
}
- public class RecordDataSynTimeModel
+ public class LocStateFeedBackModel
{
- public string sysTime { get; set; } // 鍚屾鏃堕棿
- public int synNum { get; set; } // 鍚屾鏁伴噺
- public string recordTable { get; set; } // 1.鐗╂枡鏉＄爜璁板綍琛�2.鑳氳儙鏉＄爜鐘舵�琛�3.鐗╂枡瀛樻斁鏃堕棿閰嶇疆琛�+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string loc_code { get; set; } // 绔欏彴缂栫爜
+ public string type { get; set; } // 璇锋眰绫诲瀷 1 鍏佽鍙栬揣 2 鍏佽鏀捐揣
+ public string req_no { get; set; } // 浠诲姟鍙�+ }
+ public class SynTableModel
+ {
+ public int tableType { get; set; } // 1.鍗婂埗鍝佹潯鐮佷俊鎭〃 2.鏉＄爜鐘舵�琛�3.鎶芥鐘舵�琛� }
public class SynUpdateMatlStatusModel
@@ -303,7 +269,9 @@
public class UpdateMatlStatus
{
public string bc_entried { get; set; }
+ public string mcngrp { get; set; }
public string jdge { get; set; }
+ public string last_modify_time { get; set; }
}
public class SynMatlInformationModel
--
Gitblit v1.9.1