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_PT/api/WmsController.cs | 162 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 127 insertions(+), 35 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..a9c46d0 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
@@ -19,21 +19,7 @@
{
/// <summary>
- /// 1.鎴愬瀷鏈轰笅绾胯褰�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public ResponseResult cxjOffLineRecord(OffLineModel model)
- {
- LogHelper.Info("銆�.鎴愬瀷鏈轰笅绾胯褰曘�Request锛� + JsonConvert.SerializeObject(model), "WMS");
- var result = ApiHelper.cxjOffLineRecord(model);
- LogHelper.Info("銆�.鎴愬瀷鏈轰笅绾胯褰曘�response锛� + JsonConvert.SerializeObject(result), "WMS");
- return result;
- }
-
- /// <summary>
- /// 2.璁惧淇″彿鍙嶉
+ /// 1.璁惧淇″彿鍙嶉
/// 涓氬姟鍦烘櫙锛歐CS鍙嶉鎴愬瀷鏈鸿儦鑳庝笅绾垮叆搴撲俊鍙凤紙娉細蹇呴』涓ゆ墭涓�捣涓婃姤锛屾病鏈変袱鎵橈紝鍒欒ˉ鍏呬竴涓┖鎵橈級
/// 閫昏緫锛� /// 1.鏌ヨ鎴愬瀷鏈轰笅绾胯褰曡〃锛屽垽鏂璕FID鏄惁瀛樺湪锛岀姸鎬佹槸鍚K锛屼笉瀛樺湪鎴朜G寮傚父鎺掑嚭
@@ -45,17 +31,36 @@
[HttpPost]
public ResponseResult notifyDeviceSignal(NotifyDeviceSignalModel model)
{
- LogHelper.Info("銆�.璁惧淇″彿鍙嶉銆憂otifyDeviceSignal 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ LogHelper.Info("銆�.璁惧淇″彿鍙嶉銆憂otifyDeviceSignal 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
ResponseResult responseResult = new ResponseResult();
try
{
- if (model.signalType == 1)
+ switch (model.signalType)
{
- responseResult = ApiHelper.offLineRequest(model);
- }
- else if(model.signalType == 3)
- {
- responseResult = ApiHelper.readCodeRequest(model);
+ case 1:
+ responseResult = ApiHelper.offLineRequest(model); // 涓嬬嚎璇锋眰
+ break;
+ case 2:
+ responseResult = ApiHelper.callItemOutStock(model); // 鍙枡璇锋眰
+ break;
+ case 3:
+ responseResult = ApiHelper.readCodeRequest(model); // 璇荤爜璇锋眰
+ break;
+ case 4:
+ responseResult = ApiHelper.cxjOffLineRecord(model); // 涓嬬嚎璁板綍
+ break ;
+ case 5:
+ responseResult = ApiHelper.anomalyRequest(model); // 寮傚父鐢宠
+ break;
+ case 6:
+ responseResult = ApiHelper.emptyTrayInStock(model); // 绌烘墭鍥炲簱
+ break;
+ case 7:
+ responseResult = ApiHelper.callEmptyTrayOutStock(model); // 绌烘墭鍑哄簱
+ break;
+ case 8:
+ responseResult = ApiHelper.anomalyTrayInStock(model); // 绌烘墭閲嶇疆
+ break;
}
}
catch (BusinessException be)
@@ -66,35 +71,122 @@
catch (Exception ex)
{
LogHelper.Info($"WMS鍐呴儴閿欒,閿欒鍘熷洜锛歿ex.Message}", "WMS");
+ LogHelper.Info(ex.StackTrace, "WMS");
responseResult.code = 500;
responseResult.msg = $"WMS鍐呴儴閿欒锛岃鑱旂郴寮�彂浜哄憳澶勭悊";
}
- LogHelper.Info("銆�.璁惧淇″彿鍙嶉銆憂otifyDeviceSignal 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ LogHelper.Info("銆�.璁惧淇″彿鍙嶉銆憂otifyDeviceSignal 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
return responseResult;
}
/// <summary>
- /// 3.纭寲鏈哄懠鍙儦鑳庡嚭搴�- /// 閫昏緫锛�- /// 1.鏍规嵁鏈哄彴鍙锋煡璇€�纭寲鏈哄伐鍗曡〃銆戙�銆愯儦鑳庡凡瀹屾垚鐨勬潯鐮佷腑闂磋〃銆戠瓫閫夊綋鍓嶇彮娆＄殑鐢熶骇璁″垝鏁伴噺鏄惁婊¤冻锛屽綋棰勮鐢熶骇鏁伴噺 = 瀹為檯鏁�鍦ㄩ�鏁伴噺 锛屽垯鍋滄鍙枡
- /// 2.鏌ヨ鏈哄彴鍙峰湪銆愮～鍖栨満宸ュ崟琛ㄣ�瀵瑰簲鐨勭墿鏂欑紪鐮侊紝
- /// 寮�璁＄畻锛�.宸烽亾涓嶆姤璀︺�2.鐗╂枡鐘舵�OK銆�.灏忎簬澶辨晥鏃堕棿 澶т簬绛変簬鐢熸晥鏃堕棿 4.鍔犳�鏂欏厛鍑恒�5.鍏堝叆鍏堝嚭锛堢敓浜ф椂闂达級锛夊嚭搴撶墿鏂欙紝鐢熸垚浠诲姟
+ /// 2.WCS 浠诲姟鐘舵�鍙嶉
+ /// 涓氬姟鍦烘櫙锛歐CS鍦ㄦ墽琛屼换鍔℃椂锛屽洖鎶ヤ换鍔＄姸鎬� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public ResponseResult callItemOutStock(CallItemModel model )
+ [HttpPost]
+ /*[Route("notifyTaskStatus")]*/
+ public ReturnResult notifyTaskStatus(TaskStatusFeedbackModel model)
{
- LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ LogHelper.Info("銆�.WCS浠诲姟鐘舵�鍙嶉銆慠equest锛� + JsonConvert.SerializeObject(model), "WMS");
+ var result = ApiHelper.taskStatusFeedback(model);
+ LogHelper.Info("銆�.WCS浠诲姟鐘舵�鍙嶉銆憆esponse锛� + JsonConvert.SerializeObject(result), "WMS");
+ return result;
+ }
+
+ /// <summary>
+ /// 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.callItemOutStock(model);
- LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ responseResult = ApiHelper.applyDest(model);
+ LogHelper.Info("銆�.鐢宠缁堢偣銆慳pplyDest 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
return responseResult;
+ }
+
+ /// <summary>
+ /// 4.绌烘墭鐩樿В缁�+ /// 涓氬姟鍦烘櫙锛氱┖鎵樼洏鍥炰富绾�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public ReturnResult emptyTrayUnBind(EmptyTrayUnBindModel model)
+ {
+ LogHelper.Info("銆�.绌烘墭鐩樿В缁戙�Request锛� + JsonConvert.SerializeObject(model), "WMS");
+ var result = ApiHelper.emptyTrayUnBind(model);
+ LogHelper.Info("銆�.绌烘墭鐩樿В缁戙�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
@@ -105,7 +197,7 @@
public string taskNo { get; set; }
public string cntrNo { get; set; }
public int signalType { get; set; }
- public List<BarcodeModel> extData { get; set; }
+ public object extData { get; set; }
public string deviceNo { get; set; }
}
--
Gitblit v1.9.1