1

wankeda

2026-02-26 36d872855097bc1d76b96b850a72d7749500e272

1

1

 WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs

@@ -469,7 +469,8 @@

                    Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();

                    notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo).FirstOrDefault();
                    notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();

                    if (notGroupDetail.MaterielType == 1)
                    {
                        stockInfo.WarehouseId = 6;
@@ -1298,7 +1299,7 @@

        public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
        {
            if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ObjToString())
            if (warehouse.WarehouseCode.Contains("BC"))
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
                if (palletTypeInfo == null)
@@ -1316,35 +1317,7 @@
                }
                return palletTypeInfo.PalletType;
            }

            //else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
            //{
            //    Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
            //    if (palletTypeInfo == null)
            //    {
            //        throw new Exception($"托盘号错误");
            //    }
            //    return palletTypeInfo.PalletType;
            //}
            //else if (warehouse.WarehouseCode == WarehouseEnum.HA57.ObjToString())
            //{
            //    Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
            //    if (palletTypeInfo == null)
            //    {
            //        throw new Exception($"托盘号错误");
            //    }
            //    return palletTypeInfo.PalletType;
            //}
            //else if (warehouse.WarehouseCode == WarehouseEnum.HA58.ObjToString())
            //{
            //    Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
            //    if (palletTypeInfo == null)
            //    {
            //        throw new Exception($"托盘号错误");
            //    }
            //    return palletTypeInfo.PalletType;
            //}
            return -1;
            return 0;
        }
        /// <summary>
        /// 判断正确时间格式
@@ -1581,7 +1554,7 @@
                                {
                                    OrderId = orderDetail1.OrderId,
                                    MaterielCode = item.MaterielCode,
                                    MaterielType=item.MaterielType,
                                    MaterielType = item.MaterielType,
                                    BatchNo = item.BatchNo,
                                    OrderQuantity = item.OrderQuantity,
                                    ReceiptQuantity = 0,
@@ -1777,11 +1750,11 @@
                List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
                }

                content.OK(data: dt_ReceiveOrders);
@@ -1944,7 +1917,7 @@
        }
        //反拣回库单
        public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder)
       {
        {
            try
            {
                Random random = new Random();
@@ -1952,119 +1925,119 @@
                _unitOfWorkManage.BeginTran();
                foreach (var item in houseReturnOrder)
                {
                        int randomNum = random.Next(1, 1000);
                        string datePart = DateTime.Now.ToString("yyyyMMdd");
                        Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
                        if (returnOrder == null)
                    int randomNum = random.Next(1, 1000);
                    string datePart = DateTime.Now.ToString("yyyyMMdd");
                    Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
                    if (returnOrder == null)
                    {
                        Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
                        {
                            Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
                            {
                                OrderType = OrderTypeEnum.反拣回库单.ObjToInt(),
                                MaterielCode = item.MaterielCode,
                                MaterielName = item.MaterielName,
                            OrderType = OrderTypeEnum.反拣回库单.ObjToInt(),
                            MaterielCode = item.MaterielCode,
                            MaterielName = item.MaterielName,
                            MaterieSpec = item.MaterieSpec,
                                BatchNo = item.BatchNo,
                                OrderQuantity = item.OrderQuantity,
                            BatchNo = item.BatchNo,
                            OrderQuantity = item.OrderQuantity,
                            Remark = item.Remark,
                                LinId = item.LinId,
                                LPNNo = item.LPNNo,
                            LinId = item.LinId,
                            LPNNo = item.LPNNo,
                            LocationCode = item.LocationCode,
                            WarehouseCode = item.WarehouseCode,
                            System = item.System,
                                OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                                Creater = "SMOM",
                                CreateDate = DateTime.Now
                            };
                            _returnOrderRepository.AddData(newReturnOrder);
                            OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                            Creater = "SMOM",
                            CreateDate = DateTime.Now
                        };
                        _returnOrderRepository.AddData(newReturnOrder);
                        Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.LocationCode == item.LocationCode).First();
                                Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
                                Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
                                if (stockInfo == null)
                                {
                        Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
                        Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
                        if (stockInfo == null)
                        {
                            Dt_Warehouse warehouse = _warehouseService.Repository.QueryData(x => x.WarehouseCode == item.WarehouseCode).FirstOrDefault();
                                    if (warehouse == null)
                                    {
                            if (warehouse == null)
                            {
                                return WebResponseContent.Instance.Error($"该仓库编号{item.WarehouseCode}未配置");
                                    }
                                    Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
                                    {
                                        MaterielCode = item.MaterielCode,
                                        MaterielName = item.MaterielName,
                            }
                            Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
                            {
                                MaterielCode = item.MaterielCode,
                                MaterielName = item.MaterielName,
                                MaterieSpec = item.MaterieSpec,
                                        BatchNo = item.BatchNo,
                                        LinId = item.LinId,
                                        Status = StockStatusEmun.组盘暂存.ObjToInt(),
                                        Creater = "SMOM",
                                        CreateDate = DateTime.Now,
                                        OrderNo = newReturnOrder.OrderNo,
                                        StockQuantity = item.OrderQuantity,
                                    };
                                    Dt_StockInfo stockInfo1 = new Dt_StockInfo
                                    {
                                        PalletCode = item.LPNNo,
                                        WarehouseId = warehouse.WarehouseId,
                                        BatchNo = item.BatchNo,
                                        PalletType = GetPalletType(warehouse, item.LPNNo),
                                        IsFull = true,
                                        StockStatus = (int)StockStatusEmun.反拣入库,
                                        Creater = "WMS",
                                        CreateDate = DateTime.Now,
                                        MaterialType = (int)InventoryMaterialType.原材料,
                                        Materialweight = 0,
                                        Wlstatus = (int)InventoryMaterialStatus.合格,
                                        Mgeneratetime = DateTime.Now,
                                        Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
                                    };
                                    Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
                                }
                                else
                                {
                                    outboundOrderDetail = new Dt_OutboundOrderDetail
                                    {
                                        MaterielCode = item.MaterielCode,
                                        MaterielName = item.MaterielName,
                                MaterieSpec = item.MaterieSpec,
                                        BatchNo = item.BatchNo,
                                        OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
                                Remark = item.Remark,
                                        LinId = item.LinId,
                                        LPNNo = item.LPNNo,
                                        Creater = "SMOM",
                                        CreateDate = DateTime.Now,
                                LocationName = item.LocationCode
                                    };
                                    outboundOrder = new Dt_OutboundOrder
                                    {
                                        OrderNo = "FJCK" + $"{datePart}{randomNum}",
                                        UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
                                        OrderStatus = OutOrderStatusEnum.未开始.ObjToInt(),
                                        OrderType = OrderTypeEnum.反拣出库单.ObjToInt(),
                                        InoutType = InoutTypeEnum.OtherOut.ToString(),
                                System = item.System,
                                        Creater = "SMOM",
                                        CreateDate = DateTime.Now,
                                        CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                                        Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
                                    };
                                    Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
                                }

                                BatchNo = item.BatchNo,
                                LinId = item.LinId,
                                Status = StockStatusEmun.组盘暂存.ObjToInt(),
                                Creater = "SMOM",
                                CreateDate = DateTime.Now,
                                OrderNo = newReturnOrder.OrderNo,
                                StockQuantity = item.OrderQuantity,
                            };
                            Dt_StockInfo stockInfo1 = new Dt_StockInfo
                            {
                                PalletCode = item.LPNNo,
                                WarehouseId = warehouse.WarehouseId,
                                BatchNo = item.BatchNo,
                                PalletType = GetPalletType(warehouse, item.LPNNo),
                                IsFull = true,
                                StockStatus = (int)StockStatusEmun.反拣入库,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                                MaterialType = (int)InventoryMaterialType.原材料,
                                Materialweight = 0,
                                Wlstatus = (int)InventoryMaterialStatus.合格,
                                Mgeneratetime = DateTime.Now,
                                Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
                            };
                            Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
                        }
                        else
                        {
                            Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.余料退库.ObjToInt()).First();
                            stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                            returnOrder.LinId = item.LinId;
                            outboundOrderDetail = new Dt_OutboundOrderDetail
                            {
                                MaterielCode = item.MaterielCode,
                                MaterielName = item.MaterielName,
                                MaterieSpec = item.MaterieSpec,
                                BatchNo = item.BatchNo,
                                OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
                                Remark = item.Remark,
                                LinId = item.LinId,
                                LPNNo = item.LPNNo,
                                Creater = "SMOM",
                                CreateDate = DateTime.Now,
                                LocationName = item.LocationCode
                            };
                            outboundOrder = new Dt_OutboundOrder
                            {
                                OrderNo = "FJCK" + $"{datePart}{randomNum}",
                                UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
                                OrderStatus = OutOrderStatusEnum.未开始.ObjToInt(),
                                OrderType = OrderTypeEnum.反拣出库单.ObjToInt(),
                                InoutType = InoutTypeEnum.OtherOut.ToString(),
                                System = item.System,
                                Creater = "SMOM",
                                CreateDate = DateTime.Now,
                                CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                                Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
                            };
                            Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
                        }

                    }
                    else
                    {
                        Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.余料退库.ObjToInt()).First();
                        stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                        returnOrder.LinId = item.LinId;
                        returnOrder.System = item.System;
                        returnOrder.WarehouseCode = item.WarehouseCode;
                        returnOrder.LocationCode = item.LocationCode;
                            returnOrder.OrderType = OrderTypeEnum.反拣回库单.ObjToInt();
                            returnOrder.OrderQuantity += item.OrderQuantity;
                            returnOrder.ReceiptQuantity += item.OrderQuantity;
                            _returnOrderRepository.UpdateData(returnOrder);
                            _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                        returnOrder.OrderType = OrderTypeEnum.反拣回库单.ObjToInt();
                        returnOrder.OrderQuantity += item.OrderQuantity;
                        returnOrder.ReceiptQuantity += item.OrderQuantity;
                        _returnOrderRepository.UpdateData(returnOrder);
                        _stockRepository.StockInfoRepository.UpdateData(stockInfo);

                        }
                    }
                }
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();

 WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderDetailService.cs

@@ -57,7 +57,10 @@
            {
                string orderNo = saveModel.MainData["orderNo"].ToString();
                Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == orderNo).Includes(x => x.Details).First();
                content.OK(data: inboundOrder.Details);
                if (inboundOrder != null)
                {
                    content.OK(data: inboundOrder.Details);
                }
            }
            catch (Exception ex)
            {

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs

@@ -412,39 +412,41 @@
                    if (stockInfoDetailCPList != null)
                    {
                        _stockInfoDetailCPRepository.DeleteAndMoveIntoHty(stockInfoDetailCPList, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                        foreach(var stockLPNO in houseStockDetail.DetailList)

                        for (int i = 0; i < stockInfoDetailCPList.Count(); i++)
                        {
                            Dt_StockInfo dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == stockLPNO.LPNNo).Includes(x => x.Details).First();
                            for (int i = 0; i<stockInfoDetailCPList.Count(); i++)
                            Dt_StockInfo dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == item.LPNNo).Includes(x => x.Details).First();
                            if (dt_StockInfo == null)
                            {
                                foreach (var item1 in dt_StockInfo.Details)
                                return WebResponseContent.Instance.Error($"托盘{item.LPNNo}无箱码明细信息");
                            }
                            List<Dt_StockInfoDetail> stockdetails = dt_StockInfo.Details;

                            var matchedDetail = stockdetails.FirstOrDefault(d => d.MaterielCode.Contains(stockInfoDetailCPList[i].PartNum) && d.BatchNo.Contains(item.BatchNo));
                            if (matchedDetail != null)
                            {
                                matchedDetail.StockQuantity -= (decimal)stockInfoDetailCPList[i].QtyOfpcs;
                                matchedDetail.OutboundQuantity += (decimal)stockInfoDetailCPList[i].QtyOfpcs;
                                _stockInfoDetailRepository.UpdateData(matchedDetail);

                                if (matchedDetail.StockQuantity == 0)
                                {
                                    foreach (var batchNos in houseStockDetail.DetailList)
                                    {
                                        if (stockInfoDetailCPList[i].PartNum == item1.MaterielCode && batchNos.BatchNo == item.BatchNo)
                                        {
                                            item1.StockQuantity-=(decimal)stockInfoDetailCPList[i].QtyOfpcs;
                                            item1.OutboundQuantity = 0;
                                            _stockInfoDetailRepository.UpdateData(item1);
                                        }
                                        if (item1.StockQuantity == 0)
                                        {
                                            _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(item1, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                                        }
                                        //全部都出库 删除库存
                                        if (dt_StockInfo.Details.Sum(x => x.StockQuantity) == 0)
                                        {
                                            _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(dt_StockInfo, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                                        }
                                    }
                                    _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedDetail, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                                }
                            }
                            else
                            {
                                return WebResponseContent.Instance.Error($"托盘{item.LPNNo}中未找到物料{stockInfoDetailCPList[i].PartNum}和批次{item.BatchNo}的明细");
                            }
                            if (dt_StockInfo.Details.Sum(x => x.StockQuantity) == 0)
                            {
                                _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(dt_StockInfo, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                            }
                        }
                       

                    }
                    _unitOfWorkManage.CommitTran();

                }
                _unitOfWorkManage.CommitTran();
            }
            catch (Exception ex)
            {
@@ -496,14 +498,14 @@
                    });
                    result.Item2.ForEach(x =>
                    {
                        foreach(var item in result.Item2)
                        foreach (var item in result.Item2)
                        {
                            if(item.LockQuantity > 0)
                            if (item.LockQuantity > 0)
                            {
                                item.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                            }
                        }
                        

                    });
                    result.Item3.ForEach(x =>
                    {

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs

@@ -645,9 +645,8 @@
        //查询仓库托盘货物类型
        public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
        {
            if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ObjToString() || warehouse.WarehouseCode == WarehouseEnum.SC02_BC.ObjToString())
            if (warehouse.WarehouseCode.Contains("BC"))
            {

                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
                if (palletTypeInfo == null)
                {
@@ -655,25 +654,16 @@
                }
                return palletTypeInfo.PalletType;
            }
            //else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
            //{
            //    Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
            //    if (palletTypeInfo == null)
            //    {
            //        throw new Exception($"托盘号错误");
            //    }
            //    return palletTypeInfo.PalletType;
            //}
            //else if (warehouse.WarehouseCode == WarehouseEnum.HA57.ObjToString())
            //{
            //    Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
            //    if (palletTypeInfo == null)
            //    {
            //        throw new Exception($"托盘号错误");
            //    }
            //    return palletTypeInfo.PalletType;
            //}
            return 3;
            else 
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
                if (palletTypeInfo == null)
                {
                    throw new Exception($"托盘号错误");
                }
                return palletTypeInfo.PalletType;
            }
            return 0;
        }



 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -1161,7 +1161,15 @@
                BaseDal.AddData(tasks);
                _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, locationStatus);
                _unitOfWorkManage.CommitTran();
                PushTasksToWCS(tasks);
                if (tasks.FirstOrDefault().PalletCode.Contains("BC"))
                {
                    PushTasksToWCS(tasks);
                }
                else
                {
                    PushTasksWCS(tasks);
                }
               
                content.OK();
            }
            catch (Exception ex)

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -901,7 +901,7 @@
                                         .ToList();

                                    Dt_InboundOrder? dt_InboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == inboundOrder.OrderNo).Includes(x => x.Details).First();
                                    if (StockInfos.Count  == 0) throw new Exception("未找到库存信息");
                                    if (StockInfos.Count == 0) throw new Exception("未找到库存信息");

                                    var houseSyncretism = new NewHouseInboundPassBack
                                    {
@@ -1783,7 +1783,7 @@
                                       .Where(x => x.OrderId == outboundOrder.Id)
                                       .ToList();
                            }
                            if ((outboundOrderDetails == null && outboundOrderDetails1 == null) || (outboundOrderDetails.Count == 0  && outboundOrderDetails1.Count == 0))
                            if ((outboundOrderDetails == null && outboundOrderDetails1 == null) || (outboundOrderDetails.Count == 0 && outboundOrderDetails1.Count == 0))
                            {
                                throw new Exception($"未找到托盘 {stockInfo.PalletCode} 在货位 {stockInfo.LocationCode} 上的出库单明细");
                            }
@@ -2278,7 +2278,7 @@
                            outboundOrderDetails.Add(outboundOrderDetail);
                        }

                        for (var i = 0; i<outboundOrderDetails.Count; i++)
                        for (var i = 0; i < outboundOrderDetails.Count; i++)
                        {
                            if (outboundOrderDetails[i].LocationName != null && outboundOrderDetails[i].LocationName != "")
                            {
@@ -3589,12 +3589,11 @@
        {
            Console.WriteLine($"📄 正在打印到 {printerName}: {Path.GetFileName(filePath)}");

            string command = $"lpr -P {printerName} \"{filePath}\"";
            // 使用 lp 命令，添加 -o raw 选项
            string command = $"lp -d {printerName} -o raw \"{filePath}\"";

            ExecuteShellCommand(command);
        }


        /// <summary>
        /// 执行 Shell 命令
        /// </summary>