From 8a7469560023a6efa8178f17542f4be4005b33af Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 24 六月 2025 16:17:33 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
index 9efe0bd..b87ed44 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using Model.ModelDto;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
using WMS.Entity.DataEntity;
@@ -130,7 +131,8 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="ruku"></param>
- Task AgvTransport(string palletNo, string areaNo, string ruku, int userId);
+ /// <param name="url"></param>
+ Task AgvTransport(string palletNo, string areaNo, string ruku, string url, int userId);
/// <summary>
/// agv杞繍鍛煎彨灏忚溅鍙栬揣
/// </summary>
@@ -154,7 +156,22 @@
#region 绠辩爜鎷嗙璐存爣
//绠辩爜鎷嗙娣诲姞鏍囩淇℃伅
- void AddLableByDevanning(string boxNo,decimal devanQty, int userId);
+ BoxListInfoDto AddLableByDevanning(string boxNo,decimal devanQty, int userId);
+
+
+ /// <summary>
+ /// 鏍规嵁鏀惰揣鎵樼洏鑾峰彇鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ string GetReceiptSoNoByPallet(string palletNo);
+
+ /// <summary>
+ /// 杞﹂棿鏀惰揣
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="userId"></param>
+ void ConfirmReceipt(string palletNo, int userId);
+
#endregion
--
Gitblit v1.8.0