From 5408616fd72786b63cfe69a7426c3fb499b6962b Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 17 十月 2024 18:49:04 +0800
Subject: [PATCH] Merge branch 'Liudl'
---
Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
index 021aec0..6963b55 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
@@ -50,7 +50,7 @@
/// <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,string isContinue, int userId);
+ void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo,string boxNo3,string result, decimal? qty,string isContinue, int userId);
#endregion
@@ -129,7 +129,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="ruku"></param>
- void AgvTransport(string palletNo, string areaNo, string ruku, int userId);
+ void AgvTransport(string palletNo, string areaNo, string ruku, int userId,string url);
/// <summary>
/// agv杞繍鍛煎彨灏忚溅鍙栬揣
/// </summary>
@@ -137,7 +137,17 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- void AgvTransport2(string soNo, string palletNo, string areaNo, int userId);
+ List<string> AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url);
+ #endregion
+
+ #region 绠辩爜鏌ヨ
+ /// <summary>
+ /// pda搴撳瓨鏌ヨ
+ /// </summary>
+ /// <param name="boxNo">鍌ㄤ綅缂栧彿</param>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ DataBoxDto GetBoxQueryList(string boxNo);
#endregion
}
}
--
Gitblit v1.8.0