From f42e607f9309c06394c6c46bfdc354ddd5195d51 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期四, 16 一月 2025 08:31:25 +0800
Subject: [PATCH] Merge branch 'Liudl'
---
Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
index 4429ee0..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>
/// 鑾峰彇鐗╂枡淇℃伅锛堟坊鍔犲叆搴撳崟鏄庣粏浣跨敤锛�
@@ -45,7 +45,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- string AddArrivalNotice(ArrivalNoticeVm model);
+ string AddArrivalNotice(ArrivalNoticeVm model, string url);
/// <summary>
/// 缂栬緫鍏ュ簱鍗�
/// </summary>
@@ -93,15 +93,19 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- ErpModel CreateAsn(AsnInfo model);
+ HttpReturnModel HttpCreateAsn(AsnInfo model);
/// <summary>
/// 璁㈠崟鍥炰紶涓婃父绯荤粺
/// </summary>
/// <param name="id">鍏ュ簱鍗旾D</param>
- /// <param name="url">涓婁紶璺緞</param>
+ /// <param name="erpurl">涓婁紶璺緞</param>
+ /// <param name="mesUrl">涓婁紶璺緞</param>
+ /// <param name="mesTokenUrl">mes鑾峰彇浠ょ墝璺緞</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool FinishAsn(int id, string url, int userId);
+ bool FinishAsn(int id, string erpurl, string mesUrl,string mesTokenUrl, string userNo, string pwd, int userId);
+
+ void UpLocate(string wareNo, string locatNo);
#endregion
}
--
Gitblit v1.8.0