WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/834cf2d4-40eb-4690-bfa4-bad052f0e898.vsidxBinary files differ
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8e7ab058-25f7-482b-9868-d2c3a9414aa5.vsidxBinary files differ
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/aa1655b5-bbae-48ea-b7d3-5716a47f67b4.vsidxBinary files differ
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d36a016b-a94a-49ea-9e1f-c42b0b35806c.vsidxBinary files differ
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2Binary files differ
WMS/WIDESEA_WMSServer/WIDESEA_Common/HouseAdjustment.cs
@@ -8,6 +8,8 @@ { public class HouseAdjustment { public string No { get; set; } public List<detailList> DetailList = new List<detailList>(); public class detailList WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -956,7 +956,6 @@ }; var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseSyncretism, "立库入库数量回传WMS"); // 判断Success的值 if (!response.Success) { throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}"); @@ -971,6 +970,7 @@ _stockRepository.StockInfoDetailRepository.DeleteData(sameItem.SourceItem); } _stockRepository.StockInfoRepository.UpdateData(targetstockInfo); _stockRepository.StockInfoDetailRepository.UpdateData(targetstockInfo.Details); _stockRepository.StockInfoRepository.DeleteData(stockInfo); _unitOfWorkManage.CommitTran(); WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
@@ -78,11 +78,17 @@ OrderNo = houseInventoryOut.No, WarehouseId = warehouse.WarehouseId, TakeStockStatus = TakeStockDetailStatusEnum.未盘点.ObjToInt(), Creater = "SMOM", CreateDate = DateTime.Now, Details = new List<Dt_TakeStockOrderDetailCP>() }; foreach (var item in orderAddDTO1.Details) { if (item.LPNNo == null) { return WebResponseContent.Instance.Error("盘点托盘号不能为空"); } Dt_TakeStockOrderDetailCP takeStockOrderDetail = new Dt_TakeStockOrderDetailCP() { TakeStockId = takeStockOrderCP.Id, @@ -91,6 +97,8 @@ BatchNo = item.BatchNo, MaterielSpec = item.MaterieSpec, SysQty = item.OrderQuantity, Creater = "SMOM", CreateDate = DateTime.Now, TakeDetalStatus = TakeStockDetailStatusEnum.未盘点.ObjToInt(), }; takeStockOrderCP.Details.Add(takeStockOrderDetail); WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -65,6 +65,7 @@ } List<int> orderId = newOutboundOrderDetails.Select(x => x.OrderId).Distinct().ToList(); List<Dt_NewOutboundOrder> outboundOrders = _outboundService.NewOutboundOrderService.Repository.QueryData(x => orderId.Contains(x.Id)); _unitOfWorkManage.BeginTran(); var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct); List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId)); List<string> palletcodelpn = new List<string>(); @@ -103,7 +104,7 @@ } locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList())); _unitOfWorkManage.BeginTran(); BaseDal.AddData(tasks); _stockService.StockInfoService.Repository.UpdateData(stockInfos); @@ -143,7 +144,7 @@ { throw new Exception("未找到库存信息,或库存状态不为入库完成"); } _unitOfWorkManage.BeginTran(); var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutSyncretism); List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId)); foreach (var item in stockInfos) @@ -157,7 +158,7 @@ } locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList())); _unitOfWorkManage.BeginTran(); BaseDal.AddData(tasks); _stockService.StockInfoService.Repository.UpdateData(stockInfos); @@ -199,10 +200,16 @@ throw new Exception("所选出库单明细存在出库中或已完成"); } List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>(); _unitOfWorkManage.BeginTran(); foreach (var takeStock in takeStockOrderCPs) { takeStock.TakeStockStatus = TakeStockStatusEnum.盘点中.ObjToInt(); List<Dt_TakeStockOrderDetailCP> takeStockOrderDetailCPs = _takeStockOrderDetailCPRepository.QueryData(x => x.TakeStockId == takeStock.Id); foreach (var item in takeStockOrderDetailCPs) { item.TakeDetalStatus = TakeStockDetailStatusEnum.盘点出库中.ObjToInt(); _takeStockOrderDetailCPRepository.UpdateData(item); } var lpngroup = takeStockOrderDetailCPs.GroupBy(x => x.TakePalletCode); foreach (var lpngroups in lpngroup) { @@ -233,11 +240,12 @@ } locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList())); _unitOfWorkManage.BeginTran(); BaseDal.AddData(tasks); _stockService.StockInfoService.Repository.UpdateData(stockInfos); _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails); _takeStockOrderCPRepository.UpdateData(takeStockOrderCPs); _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock.ObjToInt(), StockChangeType.Outbound.ObjToInt(), "", tasks?.Select(x => x.TaskNum).ToList()); _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock); @@ -262,19 +270,25 @@ WebResponseContent responseContent = new WebResponseContent(); try { if (houseAdjustment.DetailList.Count == 0) { return WebResponseContent.Instance.Error("无明细信息"); } List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>(); foreach (var item in houseAdjustment.DetailList) { Dt_StockInfoDetail dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id) .Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.MaterielName == item.MaterielName && stockdetail.LinId == item.LinId && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First(); if (dt_StockInfo == null) var dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id) .Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First(); if (dt_StockInfo != null) { return WebResponseContent.Instance.Error("未找到此库存数据"); } dt_StockInfo.StockQuantity = item.OrderQuantity; _unitOfWorkManage.BeginTran(); _stockInfoDetailRepository.UpdateData(dt_StockInfo); _unitOfWorkManage.CommitTran(); stockdetail.Add(dt_StockInfo); } } _unitOfWorkManage.BeginTran(); _stockInfoDetailRepository.UpdateData(stockdetail); _unitOfWorkManage.CommitTran(); } catch (Exception ex) { WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -3317,7 +3317,7 @@ // 查找联想打印机 foreach (string printer in allPrinters) { if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase)); if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase)) { Console.WriteLine($"✓ 找到联想打印机: {printer}"); return printer; @@ -3506,7 +3506,12 @@ try { //获取对应盘点单 Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First(); Dt_TakeStockOrderDetailCP takeStockOrderDetailCP = _takeStockOrderDetailCPRepository.QueryFirst(x => x.TakePalletCode == task.PalletCode); if (takeStockOrderDetailCP == null) { return content.Error($"盘点单，托盘号{takeStockOrderDetailCP.TakePalletCode}不存在"); } Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.Id == takeStockOrderDetailCP.TakeStockId).Includes(x => x.Details).First(); if (takeStockOrder == null) { return content.Error($"盘点单{task.OrderNo}不存在"); @@ -3533,7 +3538,10 @@ { return content.Error($"{stockInfo.PalletCode}盘点明细状态不正确"); } takeStockOrderDetail.TakeDetalStatus = TakeStockDetailStatusEnum.盘点出库完成.ObjToInt(); takeStockOrder.Details.ForEach(x => { x.TakeDetalStatus = TakeStockDetailStatusEnum.盘点出库完成.ObjToInt(); }); stockInfo.StockStatus = StockStatusEmun.盘点出库完成.ObjToInt(); stockInfo.Details.ForEach(x => { @@ -3565,7 +3573,7 @@ _basicService.LocationInfoService.UpdateData(locationInfo); _returnOrderRepository.AddData(returnOrder); _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum); _takeStockOrderDetailCPRepository.UpdateData(takeStockOrderDetail); _takeStockOrderCPRepository.UpdateData(takeStockOrder); _stockRepository.StockInfoRepository.UpdateData(stockInfo); _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details); BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
