From d0a265713fd18162f3a82bdcd22e267df7298c7b Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期一, 26 五月 2025 08:59:52 +0800
Subject: [PATCH] 印尼佳通-半制品代码逻辑优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/WmsController.cs | 131 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 2 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 622c185..3075273 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
@@ -2,11 +2,12 @@
using HH.WCS.Mobox3.YNJT_PT.dispatch;
using HH.WCS.Mobox3.YNJT_PT.wms;
using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Web.Http;
using static HH.WCS.Mobox3.YNJT_PT.api.ApiHelper;
using static HH.WCS.Mobox3.YNJT_PT.api.ApiModel;
-using static HH.WCS.Mobox3.YNJT_PT.api.OtherModel;
+using static HH.WCS.Mobox3.YNJT_PT.util.ExcetionHelper;
namespace HH.WCS.Mobox3.YNJT_PT.api
{
@@ -17,6 +18,132 @@
public class WmsController : System.Web.Http.ApiController
{
-
+ /// <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.璁惧淇″彿鍙嶉
+ /// 涓氬姟鍦烘櫙锛歐CS鍙嶉鎴愬瀷鏈鸿儦鑳庝笅绾垮叆搴撲俊鍙凤紙娉細蹇呴』涓ゆ墭涓�捣涓婃姤锛屾病鏈変袱鎵橈紝鍒欒ˉ鍏呬竴涓┖鎵橈級
+ /// 閫昏緫锛�+ /// 1.鏌ヨ鎴愬瀷鏈轰笅绾胯褰曡〃锛屽垽鏂璕FID鏄惁瀛樺湪锛岀姸鎬佹槸鍚K锛屼笉瀛樺湪鎴朜G寮傚父鎺掑嚭
+ /// 2.鏌ヨ鐗╂枡鏉＄爜淇℃伅琛紙green_tire_information锛夛紝淇濆瓨鑳氳儙淇℃伅
+ /// 3.寮�璁＄畻缁堢偣锛岀敓鎴愪换鍔�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public ResponseResult notifyDeviceSignal(NotifyDeviceSignalModel model)
+ {
+ LogHelper.Info("銆�.璁惧淇″彿鍙嶉銆憂otifyDeviceSignal 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ try
+ {
+ if (model.signalType == 1)
+ {
+ responseResult = ApiHelper.offLineRequest(model);
+ }
+ else if(model.signalType == 3)
+ {
+ responseResult = ApiHelper.readCodeRequest(model);
+ }
+ }
+ catch (BusinessException be)
+ {
+ responseResult.code = 501;
+ responseResult.msg = be.Message;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"WMS鍐呴儴閿欒,閿欒鍘熷洜锛歿ex.Message}", "WMS");
+ responseResult.code = 500;
+ responseResult.msg = $"WMS鍐呴儴閿欒锛岃鑱旂郴寮�彂浜哄憳澶勭悊";
+ }
+ LogHelper.Info("銆�.璁惧淇″彿鍙嶉銆憂otifyDeviceSignal 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ /// <summary>
+ /// 3.纭寲鏈哄懠鍙儦鑳庡嚭搴�+ /// 閫昏緫锛�+ /// 1.鏍规嵁鏈哄彴鍙锋煡璇€�纭寲鏈哄伐鍗曡〃銆戙�銆愯儦鑳庡凡瀹屾垚鐨勬潯鐮佷腑闂磋〃銆戠瓫閫夊綋鍓嶇彮娆＄殑鐢熶骇璁″垝鏁伴噺鏄惁婊¤冻锛屽綋棰勮鐢熶骇鏁伴噺 = 瀹為檯鏁�鍦ㄩ�鏁伴噺 锛屽垯鍋滄鍙枡
+ /// 2.鏌ヨ鏈哄彴鍙峰湪銆愮～鍖栨満宸ュ崟琛ㄣ�瀵瑰簲鐨勭墿鏂欑紪鐮侊紝
+ /// 寮�璁＄畻锛�.宸烽亾涓嶆姤璀︺�2.鐗╂枡鐘舵�OK銆�.灏忎簬澶辨晥鏃堕棿 澶т簬绛変簬鐢熸晥鏃堕棿 4.鍔犳�鏂欏厛鍑恒�5.鍏堝叆鍏堝嚭锛堢敓浜ф椂闂达級锛夊嚭搴撶墿鏂欙紝鐢熸垚浠诲姟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public ResponseResult callItemOutStock(CallItemModel model )
+ {
+ LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ ResponseResult responseResult = new ResponseResult();
+ responseResult = ApiHelper.callItemOutStock(model);
+ LogHelper.Info("銆�.纭寲鏈哄懠鍙儦鑳庡嚭搴撱�callItemOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(responseResult), "WMS");
+ return responseResult;
+ }
+
+ public class CallItemModel
+ {
+ public string mcn { get; set; }
+ public List<string> locCodes { get; set; }
+ }
+
+ public class NotifyDeviceSignalModel
+ {
+ public string reqId { get; set; }
+ public string reqTime { get; set; }
+ public string loc { get; set; }
+ public string taskNo { get; set; }
+ public string cntrNo { get; set; }
+ public int signalType { get; set; }
+ public List<BarcodeModel> extData { get; set; }
+ public string deviceNo { get; set; }
+ }
+
+ public class BarcodeModel
+ {
+ public string rfid { get; set; }
+ public string barcode { get; set; }
+ }
+
+ /* /// <summary>
+ /// 3.浠诲姟鐘舵�鍙嶉
+ /// 涓氬姟鍦烘櫙锛歐CS鍦ㄦ墽琛屼换鍔℃椂锛屽洖鎶ヤ换鍔＄姸鎬�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ *//*[Route("notifyTaskStatus")]*//*
+ public ResponseResult notifyTaskStatus(TaskStatusFeedbackModel model)
+ {
+ LogHelper.Info("notifyTaskStatus 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ var result = ApiHelper.taskStatusFeedback(model);
+ LogHelper.Info("notifyTaskStatus 鍑哄弬锛� + JsonConvert.SerializeObject(result), "WMS");
+ return result;
+ }
+
+ /// <summary>
+ /// 3.鐢宠缁堢偣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ *//* [Route("applyDest")]*//*
+ public ResponseResult applyDest(ApplyDestinationModel model)
+ {
+ LogHelper.Info("applyDest 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ var result = ApiHelper.applyDest(model);
+ LogHelper.Info("applyDest 鍑哄弬锛� + JsonConvert.SerializeObject(result), "WMS");
+ return result;
+ }*/
}
}
--
Gitblit v1.9.1