From 0c30b9dff928396bf64df03835eb8957d931c468 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 14:43:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
index 2a0e958..ceaee97 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
@@ -2,7 +2,9 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using Model.ModelDto;
using Model.ModelDto.BllCheckDto;
+using Model.ModelDto.DataDto;
using Model.ModelDto.PdaDto;
using WMS.Entity.DataEntity;
using WMS.Entity.SysEntity;
@@ -63,7 +65,7 @@
/// <param name="locatNo">鍌ㄤ綅缂栧彿</param>
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
- Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo);
+ Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxno);
#endregion
@@ -108,6 +110,13 @@
/// <returns></returns>
Task<List<SysStorageArea>> GetStorageArea(string palletNo);
/// <summary>
+ /// 鏍规嵁鍖哄煙鍙疯幏鍙栧偍浣嶅湴鍧�闆嗗悎
+ /// </summary>
+ /// <param name="areaNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ List<string> GetLocatByArea(string areaNo);
+ /// <summary>
/// 鑾峰彇宸插垎閰嶇殑鍑哄簱鍗曟嵁
/// </summary>
/// <returns></returns>
@@ -130,7 +139,19 @@
/// <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 locatNoEnd, string ruku, string url, int userId);
+ /// <summary>
+ /// 鍛煎彨agv杞繍绌烘墭鐩�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="areaNo"></param>
+ /// <param name="locatNo"></param>
+ /// <param name="url"></param>
+ /// <param name="userId"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ Task AgvNullPallet(string palletNo, string areaNo, string locatNo, string url, int userId);
/// <summary>
/// agv杞繍鍛煎彨灏忚溅鍙栬揣
/// </summary>
@@ -150,5 +171,39 @@
/// <param name="userId"></param>
public void LingxingUnbind(string palletNo, string boxNo, int userId);
#endregion
+
+
+ #region 绠辩爜鎷嗙璐存爣
+ //绠辩爜鎷嗙娣诲姞鏍囩淇℃伅
+ 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
+
+ #region 鎵樼洏鎷嗘墭鎹㈡墭
+
+ void GetBoxInfo(string boxNo, string pallNo);
+
+ void UpPalletByBox(string boxNo, string pallet, string palletNew, int userId);
+
+
+ List<SelectSkuLotNo> GetSelectSkuLotNo(string palletNo);
+
+ void UpPalletByQty(string palletNo, string palletNoNew, string detailId, decimal qty, int userId);
+
+ #endregion
}
}
--
Gitblit v1.8.0