From ad56deb081831090408f97b1c73e61a2eaed8657 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 24 六月 2025 17:22:48 +0800
Subject: [PATCH] 整合部分Modbus和TCP Socket方式处理设备交互的逻辑
---
api/MoboxController.cs | 96 +-----------------------------------------------
1 files changed, 2 insertions(+), 94 deletions(-)
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index ac5f2e8..5b9ce71 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -14,7 +14,7 @@
[RoutePrefix("api")]
public class MoboxController : ApiController {
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)
+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -26,27 +26,6 @@
return ApiHelper.GoodpackOffline(model);
}
-
- ///// <summary>
- ///// 绌烘墭/绌虹鍏ュ簱缁戝畾(PDA)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //public SimpleResult EmptyBind(EmptyBindInfo model) {
- // LogHelper.InfoApi("绌烘墭/绌虹缁戝畾", model);
-
- // if (model.CntrType == "鎵樼洏") {
- // //LogHelper.Info($"瑙﹀彂API锛氱┖鎵樼粦瀹�" + JsonConvert.SerializeObject(model), "API");
- // return ApiHelper.EmptyBindPallet(model);
- // }
- // else if (model.CntrType == "濂借繍绠�) {
- // //LogHelper.Info($"瑙﹀彂API锛氱┖绠辩粦瀹�" + JsonConvert.SerializeObject(model), "API");
- // return ApiHelper.EmptyBindGoodpack(model);
- // }
- // else {
- // return BuildSimpleResult(-1, $"涓嶅悎娉曠殑瀹瑰櫒绫诲瀷锛�{model.CntrType}'");
- // }
- //}
/// <summary>
/// 绌烘墭/绌虹鍏ュ簱(PDA)
@@ -65,42 +44,10 @@
else if (model.CntrType == "绌哄ソ杩愮") {
return ApiHelper.EmptyInboundGoodpack(model);
}
- else {
+ else { // PDA鍓嶇涓嬫媺閫夊崟闄愬埗锛屾晠鐞嗚涓婁笉浼氳繘鍏ヨ繖涓祦绋� return NewSimpleResult(-1, $"瀹瑰櫒绫诲瀷 '{model.CntrType}' 涓嶅悎娉曪細搴斾负 '绌烘墭鐩� 鎴�'绌哄ソ杩愮'");
}
}
-
- ///// <summary>
- ///// 绌烘墭/绌虹涓婄嚎(PDA)
- ///// </summary>
- ///// <returns>
- ///// 浜哄伐浣跨敤PDA鎵爜锛屾牴鎹墿鏂欑被鍨嬪垽鏂笂绾跨┖鎵�绌虹
- ///// </returns>
- //public SimpleResult EmptyOnline(EmptyOnlineInfo model) {
- // var db = DbHelper.GetDbClient();
- // var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .LeftJoin<TN_CG_Detail>((lc, cd) => lc.S_CNTR_CODE == cd.S_CNTR_CODE)
- // .Where((lc, cd) => cd.S_ITEM_CODE == model.ItemCode)
- // .First();
-
- // if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
-
- // return ApiHelper.EmptyOnlinePallet(new EmptyOnlinePalletInfo {
- // CntId = locCntrRel.S_CNTR_CODE,
- // EndLoc = model.EndLoc
- // });
- // }
- // else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
-
- // return ApiHelper.EmptyOnlineGoodpack(new EmptyOnlineGoodpackInfo {
- // CntId = locCntrRel.S_CNTR_CODE,
- // EndLoc = model.EndLoc
- // });
- // }
- // else {
- // return BuildSimpleResult(-1, $"涓嶅悎娉曠殑瀹瑰櫒绫诲瀷锛�{locCntrRel.S_CNTR_CODE}'");
- // }
- //}
/// <summary>
/// 鎵樼洏-绌烘墭涓婄嚎(PDA)
@@ -127,24 +74,6 @@
LogHelper.InfoApi(apiName, model);
return ApiHelper.EmptyOnlineGoodpack(model);
}
-
- ///// <summary>
- ///// 鍚堟牸鍥炲簱/涓嶅悎鏍肩Щ搴�- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("CheckShift")]
- //public SimpleResult CheckShift(CheckShiftInfo model) {
- // LogHelper.InfoApi("鍚堟牸鍥炲簱/涓嶅悎鏍肩Щ搴�, model);
-
- // if (model.Qualified) {
- // return ApiHelper.QualifiedBack(model);
- // }
- // else {
- // return ApiHelper.UnqualifiedShift(model);
- // }
- //}
/// <summary>
/// 鍚堟牸鍥炲簱(PDA)
@@ -202,26 +131,5 @@
}
}
- ///// <summary>
- ///// 鎶芥-鍒涘缓鎶芥鍗�WMS)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("create-check-order")]
- //public SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) {
- // return ApiHelper.CreateCheckOrder(model);
- //}
-
- ///// <summary>
- ///// 绉诲簱-鍒涘缓绉诲簱浠诲姟(WMS)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("shift-storage")]
- //public SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
- // return ApiHelper.CreateShiftOrder(model);
- //}
}
}
--
Gitblit v1.9.1