From d42ad8b01195def2a9309930e14f90ff13ad47b1 Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期四, 19 六月 2025 17:24:28 +0800
Subject: [PATCH] 印尼佳通出入库策略优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/WmsController.cs | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 166 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/WmsController.cs
index 3075273..8bec1eb 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/WmsController.cs
@@ -66,6 +66,7 @@
catch (Exception ex)
{
LogHelper.Info($"WMS鍐呴儴閿欒,閿欒鍘熷洜锛歿ex.Message}", "WMS");
+ LogHelper.Info(ex.StackTrace, "WMS");
responseResult.code = 500;
responseResult.msg = $"WMS鍐呴儴閿欒锛岃鑱旂郴寮�彂浜哄憳澶勭悊";
}
@@ -74,7 +75,22 @@
}
/// <summary>
- /// 3.纭寲鏈哄懠鍙儦鑳庡嚭搴�+ /// 3.鐢宠缁堢偣
+ /// 鍦烘櫙锛�.鍫嗗灈鏈烘斁璐у紓甯哥敵璇锋柊缁堢偣锛�2.鍫嗗灈鏈哄叆搴撹緭閫佺嚎鍫靛鐢宠鏂扮粓鐐�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ResponseResult applyDest(ApplyDestModel model)
+ {
+ LogHelper.Info("銆�.鐢宠缁堢偣銆慳pplyDest 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ responseResult = ApiHelper.applyDest(model);
+ LogHelper.Info("銆�.鐢宠缁堢偣銆慳pplyDest 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ /// <summary>
+ /// 4.纭寲鏈哄懠鍙儦鑳庡嚭搴� /// 閫昏緫锛� /// 1.鏍规嵁鏈哄彴鍙锋煡璇€�纭寲鏈哄伐鍗曡〃銆戙�銆愯儦鑳庡凡瀹屾垚鐨勬潯鐮佷腑闂磋〃銆戠瓫閫夊綋鍓嶇彮娆＄殑鐢熶骇璁″垝鏁伴噺鏄惁婊¤冻锛屽綋棰勮鐢熶骇鏁伴噺 = 瀹為檯鏁�鍦ㄩ�鏁伴噺 锛屽垯鍋滄鍙枡
/// 2.鏌ヨ鏈哄彴鍙峰湪銆愮～鍖栨満宸ュ崟琛ㄣ�瀵瑰簲鐨勭墿鏂欑紪鐮侊紝
@@ -84,17 +100,162 @@
/// <returns></returns>
public ResponseResult callItemOutStock(CallItemModel model )
{
- LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
ResponseResult responseResult = new ResponseResult();
responseResult = ApiHelper.callItemOutStock(model);
- LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
return responseResult;
+ }
+
+ /// <summary>
+ /// 5.绌烘墭鍥炵珛搴�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ResponseResult emptyTrayInStock(EmptyTrayInStockModel model )
+ {
+ LogHelper.Info("銆�.绌烘墭鍥炵珛搴撱�emptyTrayInStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ responseResult = ApiHelper.emptyTrayInStock(model);
+ LogHelper.Info("銆�.绌烘墭鍥炵珛搴撱�emptyTrayInStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ /// <summary>
+ /// 6.鎴愬瀷鏈哄懠鍙┖鎵�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ResponseResult callEmptyTrayOutStock(CallEmptyTrayOutStockModel model)
+ {
+ LogHelper.Info("銆�.鎴愬瀷鏈哄懠鍙┖鎵樸�callEmptyTrayOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ responseResult = ApiHelper.callEmptyTrayOutStock(model);
+ LogHelper.Info("銆�.鎴愬瀷鏈哄懠鍙┖鎵樸�callEmptyTrayOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ /// <summary>
+ /// 7.鑳庤儦绔嬪簱鎶芥鍑哄簱銆佷汉宸ュ嚭搴撹儙鑳�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ResponseResult embryoCheckOutStock(EmbryoCheckOutStockModel model)
+ {
+ LogHelper.Info("銆�.鑳庤儦绔嬪簱鎶芥鍑哄簱銆慹mbryoCheckOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ responseResult = ApiHelper.embryoCheckOutStock(model);
+ LogHelper.Info("銆�7.鑳庤儦绔嬪簱鎶芥鍑哄簱銆慹mbryoCheckOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ /// <summary>
+ /// 8.寮傚父鍥炲簱娴佺▼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ResponseResult anomalyTrayInStock(AnomalyTrayInStockModel model)
+ {
+ LogHelper.Info("銆�.寮傚父鍥炲簱娴佺▼銆慹mbryoCheckOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ responseResult = ApiHelper.anomalyTrayInStock(model);
+ LogHelper.Info("銆�.寮傚父鍥炲簱娴佺▼銆慹mbryoCheckOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ /// <summary>
+ /// 9.WCS 浠诲姟鐘舵�鍙嶉
+ /// 涓氬姟鍦烘櫙锛歐CS鍦ㄦ墽琛屼换鍔℃椂锛屽洖鎶ヤ换鍔＄姸鎬�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ /*[Route("notifyTaskStatus")]*/
+ public ReturnResult notifyTaskStatus(TaskStatusFeedbackModel model)
+ {
+ LogHelper.Info("銆�.WCS浠诲姟鐘舵�鍙嶉銆慠equest锛� + JsonConvert.SerializeObject(model), "WMS");
+ var result = ApiHelper.taskStatusFeedback(model);
+ LogHelper.Info("銆�.WCS浠诲姟鐘舵�鍙嶉銆憆esponse锛� + JsonConvert.SerializeObject(result), "WMS");
+ return result;
+ }
+
+ /// <summary>
+ /// 10.绌烘墭鐩樿В缁�+ /// 涓氬姟鍦烘櫙锛氱┖鎵樼洏鍥炰富绾�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public ReturnResult emptyTrayUnBind(EmptyTrayUnBindModel model)
+ {
+ LogHelper.Info("銆�0.绌烘墭鐩樿В缁戙�Request锛� + JsonConvert.SerializeObject(model), "WMS");
+ var result = ApiHelper.emptyTrayUnBind(model);
+ LogHelper.Info("銆�0.绌烘墭鐩樿В缁戙�response锛� + JsonConvert.SerializeObject(result), "WMS");
+ return result;
+ }
+
+ public class EmptyTrayUnBindModel
+ {
+ public string rfid { get; set; } // 鎵樼洏鍙�+ }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�鍙嶉妯″瀷
+ /// </summary>
+ public class TaskStatusFeedbackModel
+ {
+ public string taskNo { get; set; } // 浠诲姟鍙�+ public string subTaskNo { get; set; } // 瀛愪换鍔″彿
+ public int status { get; set; } // 浠诲姟鐘舵� 1锛氬紑濮�鎵ц涓紱2:瀹屾垚锛�锛氬噯澶囧彇璐э紱4锛氬彇璐у畬鎴愶紱5锛氬噯澶囧嵏璐э紱6锛氬嵏璐у畬鎴愶紱7锛氬紓甯稿彇娑堬紱8锛氬己鍒跺畬鎴�+ public string deviceNo { get; set; } // 璁惧鍙�+ public string errCode { get; set; } // 寮傚父浠ｇ爜 0.鏃犲紓甯�1.璁惧鏁呴殰鐮併�2.rfid鏍￠獙澶辫触銆�.鍙栬揣鏃犺揣銆�.鏀捐揣鏈夎揣
+ public string loc { get; set; } // 褰撳墠璐т綅
+ }
+
+ public class AnomalyTrayInStockModel
+ {
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string startLoc { get; set; }
+ public string trayCode { get; set; } // 瀹瑰櫒缂栫爜
+ }
+
+ public class EmbryoCheckOutStockModel
+ {
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string trayCode { get; set; } // 瀹瑰櫒缂栫爜
+ }
+
+ public class CallEmptyTrayOutStockModel
+ {
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string endLoc { get; set; } // 缁堢偣
+ }
+
+ public class EmptyTrayInStockModel
+ {
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string startLoc { get; set; } // 璧风偣
+ public string trayCode { get; set; } // 瀹瑰櫒缂栫爜
+ }
+
+ public class ApplyDestModel
+ {
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string taskNo { get; set; } // 浠诲姟鍙�+ public int applyType { get; set; } //鐢宠绫诲瀷 1.鍫嗗灈鏈烘斁璐у紓甯哥敵璇锋柊缁堢偣锛�2.鍫嗗灈鏈哄叆搴撹緭閫佺嚎鍫靛鐢宠鏂扮粓鐐�+ public string loc { get; set; }
}
public class CallItemModel
{
- public string mcn { get; set; }
- public List<string> locCodes { get; set; }
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public List<string> locCodes { get; set; } // 纭寲鏈哄伐浣� }
public class NotifyDeviceSignalModel
--
Gitblit v1.9.1