From 19be6575a27a007b3dba7b0d28ddb769b5a1fed6 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期二, 26 三月 2024 16:31:46 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
index f5799f7..021aec0 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
@@ -4,6 +4,7 @@
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
using WMS.Entity.DataEntity;
+using WMS.Entity.SysEntity;
namespace WMS.IBLL.IPdaServer
{
@@ -33,8 +34,9 @@
/// <param name="crDetail">鐩樼偣鏄庣粏ID 鐗╂枡-鎵规</param>
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <param name="boxNo">绠辩爜鍙�</param>
+ /// <param name="isContinue">鏄惁鏁伴噺鐩樼偣</param>
/// <returns></returns>
- List<StockCheckLogDto> GetStockCheckLogList(string crNo, string crDetail,string palletNo,string boxNo);
+ List<StockCheckLogDto> GetStockCheckLogList(string crNo, string crDetail,string palletNo,string boxNo,string isContinue);
/// <summary>
/// 鐩樼偣搴撳瓨
@@ -46,8 +48,9 @@
/// <param name="boxNo3">鏀爜</param>
/// <param name="result">缁撴灉</param>
/// <param name="qty">鏁伴噺</param>
+ /// <param name="isContinue">鏄惁鏁伴噺鐩樼偣</param>
/// <param name="userId"></param>
- void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo,string boxNo3,string result, int? qty,int userId);
+ void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo,string boxNo3,string result, int? qty,string isContinue, int userId);
#endregion
@@ -90,5 +93,51 @@
#endregion
+ #region AGV杞繍
+ /// <summary>
+ /// 鑾峰彇鎵樼洏鎵�鍦ㄥ偍浣嶅湴鍧�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <returns></returns>
+ string GetPalletLocatNo(string palletNo);
+ /// <summary>
+ /// 鑾峰彇鎵樼洏鎵�鍦ㄦゼ灞傛墍鏈夊尯鍩�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <returns></returns>
+ List<SysStorageArea> GetStorageArea(string palletNo);
+ /// <summary>
+ /// 鑾峰彇宸插垎閰嶇殑鍑哄簱鍗曟嵁
+ /// </summary>
+ /// <returns></returns>
+ List<string> GetRunSoNoticeList();
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栨墭鐩樹笂鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <returns></returns>
+ List<DataStockDetail> GetSkuInfoByPalletNo(string palletNo);
+ /// <summary>
+ /// 鏍规嵁鍑哄簱鍗曞彿鑾峰彇鍒嗛厤鐨勬墭鐩樹俊鎭�
+ /// </summary>
+ /// <param name="soNo"></param>
+ /// <returns></returns>
+ List<string> GetPalletNoListBySoNo(string soNo);
+ /// <summary>
+ /// agv杞繍鍛煎彨灏忚溅
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="areaNo"></param>
+ /// <param name="ruku"></param>
+ void AgvTransport(string palletNo, string areaNo, string ruku, int userId);
+ /// <summary>
+ /// agv杞繍鍛煎彨灏忚溅鍙栬揣
+ /// </summary>
+ /// <param name="soNo"></param>
+ /// <param name="palletNo"></param>
+ /// <param name="areaNo"></param>
+ /// <param name="userId"></param>
+ void AgvTransport2(string soNo, string palletNo, string areaNo, int userId);
+ #endregion
}
}
--
Gitblit v1.8.0