From fe41831b0e9057a16aef1e82048105aee671bbda Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 19 十月 2024 19:08:06 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
index a55e6df..e8a088d 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
@@ -32,7 +32,7 @@
/// </summary>
/// <param name="id">id</param>
/// <returns></returns>
- string GetAsnDetailQtyList(int id);
+ LabelPrintInfoDto GetAsnDetailQtyList(int id);
/// <summary>
/// 鑾峰彇鐗╂枡淇℃伅锛堟坊鍔犲叆搴撳崟鏄庣粏浣跨敤锛�
@@ -103,7 +103,7 @@
/// <param name="mesTokenUrl">mes鑾峰彇浠ょ墝璺緞</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool FinishAsn(int id, string erpurl, string mesUrl,string mesTokenUrl, int userId);
+ bool FinishAsn(int id, string erpurl, string mesUrl,string mesTokenUrl, string userNo, string pwd, int userId);
void UpLocate(string wareNo, string locatNo);
--
Gitblit v1.8.0