From 98e221d6dc26183efab868ee5f11a65d5791304e Mon Sep 17 00:00:00 2001 From: test <15284381150@163.com> Date: 星期五, 19 九月 2025 08:02:20 +0800 Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS --- Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs index 9c0210f..88d203c 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<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo, string boxno); #endregion @@ -133,6 +135,17 @@ /// <param name="url"></param> Task AgvTransport(string palletNo, string areaNo, 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> /// <param name="soNo"></param> @@ -155,9 +168,35 @@ #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 + #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