From d3e81088f1afdc01b14af6bdac533116ab0cdb60 Mon Sep 17 00:00:00 2001 From: bklLiudl <673013083@qq.com> Date: 星期五, 27 六月 2025 17:04:54 +0800 Subject: [PATCH] Merge branch 'master' into Liudl --- Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs index 7c5b974..c6beb28 100644 --- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs +++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs @@ -7,6 +7,8 @@ using Model.ModelDto.PdaDto; using WMS.Entity.BllAsnEntity; using Model.ModelDto.DataDto; +using Model.ModelDto.SysDto; +using Model.ModelVm.SysVm; namespace WMS.IBLL.IPdaServer { @@ -20,8 +22,29 @@ List<string> GetNoPasteAsnNoStrList(); //鏍规嵁鍗曟嵁鑾峰彇鏍囩鏁伴噺 BoxListInfoDto GetBoxCountByAsn(string asnNo, int? asnDetailId); + + /// <summary> + /// 淇濆瓨鎸囧畾鐨勫偍浣� + /// </summary> + /// <param name="palletNo"></param> + /// <param name="locateNo"></param> + /// <param name="userId"></param> + void SaveAppointLocate(string palletNo, string locateNo, int userId); + + List<BoxInfoDto> GetWmsBoxInfos(string boxNo); + + void ChejianIn(string palletNo, string boxNo, decimal qty,string areaNo, int userId); + + void ChejianQtyIn(string palletNo, string skuNo, string lotNo, decimal qty, string areaNo, int userId); + #endregion + + // 鏍规嵁鐗╂枡缂栫爜銆佸悕绉拌幏鍙栫墿鏂欎俊鎭�� + MaterialsDto GetSkuInfo(GetMaterialsVm model); + + // 鐢熸垚绾胯竟搴撶鐮侊紝杩斿洖绠辩爜淇℃伅銆� + List<BllBoxInfo> AddLabels(LabelsVm model); // 鑾峰彇鍗曟嵁鍒楄〃 List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model); @@ -115,7 +138,7 @@ void CompleteInStockLing(PdaLingAsnVm model, int userId); // 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅 - List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model); + List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model,string url); //鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛� List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model); @@ -124,7 +147,7 @@ void ConfirmInStock(PalletBindVm model); //鏍规嵁绠辩爜鍚戣拷婧郴缁熻姹傜淇℃伅 - List<BoxInfoDto> GetFMBindBoxInfos(string boxno); + List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url); #region JC23鍙栨牱涓氬姟鎺ュ彛 -- Gitblit v1.8.0