修改

yanjinhui

2025-10-18 d48e486d63ae2a0fc454c27c79b8f12115e4bcbe

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs

@@ -1,10 +1,12 @@
using HslCommunication;
using MailKit.Search;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.TaskEnum;
@@ -24,7 +26,7 @@

namespace WIDESEA_SquareCabinServices
{
    public class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
    public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
    {
        static string SearchDate = "";
        private readonly IBasicService _basicService;
@@ -33,8 +35,9 @@
        private readonly IInventoryInfoService _inventoryInfoService;
        private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
        private readonly ISupplyTaskService _supplyTaskService;
        private readonly ICabinOrderServices _cabinOrderServices;
        public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService) : base(BaseDal)
        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices) : base(BaseDal)
        {
            _basicService = basicService;
            _unitOfWorkManage = unitOfWorkManage;
@@ -42,6 +45,7 @@
            _supplyTaskService = supplyTaskService;
            _inventory_BatchServices = inventory_BatchServices;
            _inventoryInfoService = inventoryInfoService;
            _cabinOrderServices = cabinOrderServices;
        }

        /// <summary>
@@ -172,7 +176,10 @@
        //}



        /// <summary>
        /// è¿‡æ»¤æ²¡æœ‰å¯¹å•†å“è¿›è¡Œç»´æŠ¤çš„出库单进行过滤
        /// </summary>
        /// <returns></returns>
        public WebResponseContent GetUpstreamOutOrder()
        {
            var responseContent = new WebResponseContent();
@@ -218,9 +225,12 @@
                try
                {
                    List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
                    List<string> orderNos = new();

                    foreach (var outorder in newOutOrders)
                    {

                        bool skipOrder = false; // æ ‡è®°æ˜¯å¦è·³è¿‡è¯¥å…¥åº“单
                        var entityOrder = new Dt_DeliveryOrder
                        {
                            Out_no = outorder.order_no,
@@ -238,19 +248,40 @@
                        {
                            //  1️⃣ è½¬ä¸ºæ­£æ•°ï¼ˆä¸Šæ¸¸å¯èƒ½ä¼ è´Ÿæ•°ï¼‰
                            item.order_qty = Math.Abs(item.order_qty);

                            //出库数量
                            decimal orderQty = (decimal)item.order_qty;

                            //  2️⃣ æŸ¥ç‰©æ–™åŸºç¡€ä¿¡æ¯ï¼ˆèŽ·å–箱规）
                            var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
                                .Where(m => m.Goods_no == item.goods_no)
                            var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
                                .Where(m => m.MaterielCode == item.goods_no)
                                .First();
                            #region æ£€æŸ¥è¿™ä¸ªå‡ºåº“单中的物料信息是否存在
                            //如果物料信息不存在，跳过整个入库单
                            if (medication == null)
                            {
                                skipOrder = true;
                                Console.WriteLine($"跳过入库单 {outorder.order_no}，原因：未找到商品 [{item.goods_no}] çš„物料信息。");
                                break;
                            }


                            //  è‹¥ç‰©æ–™ä¸å­˜åœ¨æˆ– MaterielSourceType ä¸ºç©ºï¼Œåˆ™è·³è¿‡æ•´ä¸ªå‡ºåº“单
                            if (medication == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
                            {
                                skipOrder = true;
                                break;
                            }

                            
                            if (medication == null)
                            {
                                SendErrorToUpstream(3, "", $"找不到物料信息：{item.goods_no}", "");
                                continue;
                            }
                            #endregion

                            // å¦‚果箱规小于等于0，使用默认值1,否则就用实际数量
                            decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;

                            //  3️⃣ è®¡ç®—整件与散件数量
@@ -261,31 +292,61 @@
                            string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;

                            // helper: æŸ¥è¯¢åº“存函数（按入库时间升序）
                            Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
                            #region ä½¿ç”¨åº“存信息中的stockStatus来区分平库和立库
                            // å®šä¹‰ä¸€ä¸ªå§”托变量：输入int参数，返回List<Dt_InventoryInfo>
                            //Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
                            //{
                            //    // 1. åˆ›å»ºåŸºç¡€æŸ¥è¯¢
                            //    var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                            //        .Where(i => i.MaterielCode == item.goods_no &&           // ç‰©æ–™ç¼–号匹配
                            //                    (i.StockQuantity - i.OutboundQuantity) > 0 && // å¯ç”¨åº“å­˜>0
                            //                    i.StockStatus == stockStatus);               // åº“存状态匹配

                            //    // 2. æ¡ä»¶ç­›é€‰ï¼ˆå¦‚果有批次号要求）
                            //    if (!string.IsNullOrEmpty(requestedBatch))
                            //        q = q.Where(i => i.BatchNo == requestedBatch);

                            //    // 3. æ‰§è¡ŒæŸ¥è¯¢å¹¶è¿”回结果
                            //    return q.OrderBy(i => i.InDate).ToList();  // æŒ‰å…¥åº“时间排序
                            //}; 
                            #endregion

                            #region ä½¿ç”¨åº“房编号来区分是平库和立库
                            // helper: æŸ¥è¯¢åº“存函数（按入库时间升序）
                            // ç”¨åº“房编号区分立库和平库：立库 WarehouseCode == "001" è¾“å…¥true就是立库否则就是平库
                            Func<bool, List<Dt_InventoryInfo>> queryInventoryByWarehouseType = (isLiku) =>
                            {
                                var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                                    .Where(i => i.MaterielCode == item.goods_no &&
                                                (i.StockQuantity - i.OutboundQuantity) > 0 &&
                                                i.StockStatus == stockStatus);
                                                (i.StockQuantity - i.OutboundQuantity) > 0);

                                if (isLiku)
                                    q = q.Where(i => i.WarehouseCode == "001"); // ç«‹åº“
                                else
                                    q = q.Where(i => i.WarehouseCode != "001"); // å¹³åº“

                                if (!string.IsNullOrEmpty(requestedBatch))
                                    q = q.Where(i => i.BatchNo == requestedBatch);

                                return q.OrderBy(i => i.InDate).ToList();
                            };

                            // 4️⃣分配散件（优先立库 Status=1）
                            decimal remainingPartial = partialQty;
                            #endregion
                            // 4️⃣分配散件（优先立库 WarehouseCode == "001）
                            decimal remainingPartial = partialQty; //散件
                            if (remainingPartial > 0)
                            {
                                var invList_ly = queryInventoryByStockStatus(1);
                                //返回一个List<Dt_InventoryInfo>stockStatus==0的库存列表
                                var invList_ly = queryInventoryByWarehouseType(true); //立库 WarehouseCode == "001"
                                foreach (var inv in invList_ly)
                                {
                                    if (remainingPartial <= 0) break;

                                    //可用库存数量
                                    decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);

                                    if (available <= 0) continue;

                                    //表示「当前还需要出库的数量」或「待分配数量」。
                                    decimal use = Math.Min(available, remainingPartial);

                                    var detail = new Dt_DeliveryOrderDetail
@@ -296,11 +357,11 @@
                                        Exp_date = inv.ValidityPeriod,
                                        OotDetailStatus = "新建",
                                        Status = 0, //立库
                                        Reservoirarea = inv.LocationCode
                                        Reservoirarea = inv.WarehouseCode
                                    };
                                    entityOrder.Details.Add(detail);

                                    inv.OutboundQuantity += (float)use;
                                    inv.OutboundQuantity += use;
                                    BaseDal.Db.Updateable(inv).ExecuteCommand();

                                    remainingPartial -= use;
@@ -309,7 +370,7 @@
                                // ç«‹åº“不够 â†’ å¹³åº“è¡¥ (Status=2)
                                if (remainingPartial > 0)
                                {
                                    var invList_pk = queryInventoryByStockStatus(2);
                                    var invList_pk = queryInventoryByWarehouseType(false); //平库
                                    foreach (var inv in invList_pk)
                                    {
                                        if (remainingPartial <= 0) break;
@@ -327,11 +388,11 @@
                                            Exp_date = inv.ValidityPeriod,
                                            OotDetailStatus = "新建",
                                            Status = 2, //平库
                                            Reservoirarea = inv.LocationCode
                                            Reservoirarea = inv.WarehouseCode
                                        };
                                        entityOrder.Details.Add(detail);

                                        inv.OutboundQuantity += (float)use;
                                        inv.OutboundQuantity += use;
                                        BaseDal.Db.Updateable(inv).ExecuteCommand();

                                        remainingPartial -= use;
@@ -345,10 +406,10 @@
                            }

                            //分配整件（优先平库 Status=2）
                            int remainingFullBoxes = fullBoxes;
                            int remainingFullBoxes = fullBoxes;//整件箱数
                            if (remainingFullBoxes > 0)
                            {
                                var invList_pk = queryInventoryByStockStatus(2);
                                var invList_pk = queryInventoryByWarehouseType(true);
                                foreach (var inv in invList_pk)
                                {
                                    if (remainingFullBoxes <= 0) break;
@@ -370,20 +431,20 @@
                                        Exp_date = inv.ValidityPeriod,
                                        OotDetailStatus = "新建",
                                        Status = 2, //平库
                                        Reservoirarea = inv.LocationCode
                                        Reservoirarea = inv.WarehouseCode
                                    };
                                    entityOrder.Details.Add(detail);

                                    inv.OutboundQuantity += (float)useQty;
                                    inv.OutboundQuantity += useQty;
                                    BaseDal.Db.Updateable(inv).ExecuteCommand();

                                    remainingFullBoxes -= useBoxes;
                                }

                                // å¹³åº“不够 â†’ ç«‹åº“è¡¥ (Status=1)
                                // å¹³åº“不够 â†’ ç«‹åº“è¡¥ (Status=0)
                                if (remainingFullBoxes > 0)
                                {
                                    var invList_ly = queryInventoryByStockStatus(1);
                                    var invList_ly = queryInventoryByWarehouseType(true); //立库
                                    foreach (var inv in invList_ly)
                                    {
                                        if (remainingFullBoxes <= 0) break;
@@ -409,11 +470,17 @@
                                        };
                                        entityOrder.Details.Add(detail);

                                        inv.OutboundQuantity += (float)useQty;
                                        inv.OutboundQuantity += useQty;
                                        BaseDal.Db.Updateable(inv).ExecuteCommand();

                                        remainingFullBoxes -= useBoxes;
                                    }
                                }
                                // â—如果跳过该单，则直接continue，不保存
                                if (skipOrder)
                                {
                                    Console.WriteLine($"跳过入库单 {outorder.order_no}，因为存在未定义物料属性的商品。");
                                    continue;
                                }

                                if (remainingFullBoxes > 0)
@@ -421,6 +488,7 @@
                                    decimal unfilledQty = remainingFullBoxes * boxQty;
                                    SendErrorToUpstream(3, "", $"出库单[{outorder.order_no}]物料[{item.goods_no}]整箱库存不足，未分配数量：{unfilledQty}", "");
                                }

                            }
                        }

@@ -448,7 +516,6 @@
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }


        /// <summary>
        /// å‡ºåº“单推送给 WCS
@@ -484,10 +551,10 @@
                        string materialCode = "YY";//默认值
                                                   //获取当前订单的第一个明细项
                        var firstDetail = order.Details.FirstOrDefault();
                        if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterialCode))
                        if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
                        {
                            //如果条件满足，将物料代码设置为第一个明细项对应的药品物料代码
                            materialCode = firstDetail.MedicineGoods.MaterialCode;
                            materialCode = firstDetail.MedicineGoods.MaterielErpType;
                        }
                        // 3. ç»„装 DTO
                        var ediDto = new TowcsDto.ToediOutInfo
@@ -502,8 +569,8 @@
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = d.MedicineGoods?.Goods_spm,
                                productSpecifications = d.MedicineGoods?.Model,
                                productName = d.MedicineGoods?.MaterielName,
                                productSpecifications = d.MedicineGoods?.MaterielModel,
                                quantity = (int)d.Order_qty,
                                //stocktakingDetails = order.Out_type == "3"
                                //    ? new List<ToOutediInStock>
@@ -532,7 +599,6 @@
                              .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "已完成" })
                              .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
                              .ExecuteCommand();

                            Console.WriteLine($"订单 {order.Out_no} æŽ¨é€æˆåŠŸ");
                        }
                        else
@@ -559,221 +625,67 @@
        }


        /// <summary>
        /// å‡ºåº“报完成接口
        /// </summary>
        /// <param name="out_no">出库单号</param>
        /// <returns></returns>
        //public WebResponseContent CompleteOutOrder(string out_no)
        //{
        //    var responseContent = new WebResponseContent();
        //    try
        //    {
        //        if (string.IsNullOrWhiteSpace(out_no))
        //        {
        //            return responseContent.Error("入库单号不可以为空");
        //        }

        //        Db.Ado.BeginTran();
        //        //先查头表
        //        var outOerd= BaseDal.Db.Queryable<Dt_DeliveryOrder>()
        //            .Where(o => o.Out_no == out_no)
        //            .First();
        //        if (outOerd == null)
        //        {
        //            return responseContent.Error($"没有找到该出库单号{out_no}");
        //        }
        //        //查找所有明细表是否都已完成
        //        var incompleteDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
        //            .Where(d => d.DeliveryOrderId == outOerd.Id && d.OotDetailStatus == "已完成")
        //            .Count();
        //        if (incompleteDetails>0)
        //        {
        //            // æ›´æ–°å‡ºåº“单状态
        //            BaseDal.Db.Updateable<Dt_DeliveryOrder>()
        //              .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "开始" })
        //              .Where(o => o.Out_no == out_no)
        //              .ExecuteCommand();
        //            var url = " http://127.0.0.1:9090/GYZ2/95fck/outOrderOk";
        //            var reslut = HttpHelper.Post(url, new { out_no }.ToJsonString());
        //            var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(reslut);
        //            if (response.resultCode != "0")
        //            {
        //                SendErrorToUpstream(4, "", "上游接口返回失败", "");
        //                return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
        //            }
        //            Db.Ado.CommitTran();
        //            return responseContent.OK("操作成功,出库单以及明细全部完成");
        //        }
        //        else
        //        {
        //            return responseContent.OK("操作成功，但任有为完成的明细");
        //        }
        //    }
        //    catch (Exception ex)
        //    {
        //        Db.Ado.RollbackTran();
        //        SendErrorToUpstream(1, "", ex.Message, "");
        //        return responseContent.Error("同步失败: " + ex.Message);
        //    }
        //}


        /// <summary>
        ///盘点出库单推送给 WCS
        /// </summary>
        /// <param name="externalOrderNo">出库单号</param>
        /// <returns></returns>
        //public WebResponseContent InventoryGood(string externalOrderNo)
        //{
        //    try
        //    {
        //        // æŸ¥è¯¢å‡ºåº“单及明细
        //        var orders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
        //            .Where(x => x.Out_no == externalOrderNo)
        //            .Includes(o => o.Details, d => d.MedicineGoods)
        //            .ToList();


        //        if (orders == null || orders.Count == 0)
        //        {
        //            return new WebResponseContent().Error("没有找到该出库单");
        //        }

        //        var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut"; 
        //        bool allSuccess = true;

        //        foreach (var order in orders)
        //        {
        //            //查找给商品的库存
        //            var Invert = BaseDal.Db.Queryable<Dt_Inventory>()
        //                .Where(i => i.Goods_no == order.Out_no).First();
        //            var ediDto = new TowcsDto.ToediOutInfo
        //            {
        //                customerCode = "905",
        //                materialCode = "YY",
        //                externalOrderNo = order.Out_no,
        //                outOrderType = "20", // ç›˜ç‚¹å‡ºåº“单
        //                priority = 1,
        //                Is_cancel = 0,
        //                details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
        //                {
        //                    batchNo = d.Batch_num,
        //                    productCode = d.Goods_no,
        //                    productName = d.MedicineGoods?.Goods_spm,
        //                    productSpecifications = d.MedicineGoods?.Model,
        //                    quantity = (int)d.Order_qty,
        //                    stocktakingDetails = new List<TowcsDto.ToOutediInStock>
        //            {
        //                new TowcsDto.ToOutediInStock
        //                {
        //                    palletCode = Invert.PalletCode,  // å®žé™…从系统取
        //                    quantity = d.Order_qty.ToString()
        //                }
        //            }
        //                }).ToList()
        //            };

        //            var result = HttpHelper.Post(url, ediDto.ToJsonString());
        //            var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);

        //            if (resp == null || resp.code != "0")
        //            {
        //                allSuccess = false;
        //                break;
        //            }
        //        }

        //        return allSuccess
        //            ? new WebResponseContent { Status = true, Message = "盘点成功" }
        //            : new WebResponseContent { Status = false, Message = "盘点失败" };
        //    }
        //    catch (Exception ex)
        //    {
        //        return new WebResponseContent { Status = false, Message = ex.Message };
        //    }
        //}


        public WebResponseContent InventoryGood(string externalOrderNo)
        //盘点 æ‹¿æ•´ä¸ªæ‰¹æ¬¡ä¿¡æ¯è¡¨çš„商品批号和商品编号来进行盘点
        public WebResponseContent InventoryGood(string batchNo, string goodsNo)
        {
            var response = new WebResponseContent();
            try
            {
                // 1. æŸ¥å‡ºå‡ºåº“单及明细
                var orders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
                    .Where(x => x.Out_no == externalOrderNo)
                    .Includes(o => o.Details, d => d.MedicineGoods)
                    .ToList();
                // 1️⃣ æŸ¥æ‰¾æŒ‡å®šæ‰¹æ¬¡ä¸Žç‰©æ–™çš„库存信息
                var batchInfo = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                    .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
                    .First();

                if (orders == null || orders.Count == 0)
                    return new WebResponseContent().Error("没有找到该出库单");
                if (batchInfo == null)
                    return response.Error($"未找到该物料 [{goodsNo}] æ‰¹æ¬¡ [{batchNo}] çš„库存信息");

                // 2. èŽ·å–所有商品编号
                var allGoodsNos = orders
                    .SelectMany(o => o.Details.Select(d => d.Goods_no))
                    .Distinct()
                    .ToList();

                // 3. ä¸€æ¬¡æ€§æŸ¥è¯¢åº“存信息
                var inventoryList = BaseDal.Db.Queryable<Dt_Inventory>()
                    .Where(i => allGoodsNos.Contains(i.Goods_no))
                    .ToList();

                var inventoryDict = inventoryList.ToDictionary(i => i.Goods_no, i => i);
                string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
                bool allSuccess = true;

                // 4. æž„造盘点出库请求
                foreach (var order in orders)
                // 2️⃣ ç»„装请求 DTO（完全符合接口文档结构）
                var ediDto = new TowcsDto.ToediOutInfo
                {
                    var ediDto = new TowcsDto.ToediOutInfo
                    {
                        customerCode = "905",
                        materialCode = "YY",
                        externalOrderNo = order.Out_no,
                        outOrderType = "20", // ç›˜ç‚¹å‡ºåº“单
                        priority = 1,
                        Is_cancel = 0,
                        details = order.Details.Select(d =>
                        {
                            inventoryDict.TryGetValue(d.Goods_no, out var invert);

                            return new TowcsDto.ToeOutdiInDetail
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = d.MedicineGoods?.Goods_spm,
                                productSpecifications = d.MedicineGoods?.Model,
                                quantity = (int)d.Order_qty,
                                stocktakingDetails = new List<TowcsDto.ToOutediInStock>
                        {
                            new TowcsDto.ToOutediInStock
                            {
                                palletCode = invert?.PalletCode ?? string.Empty,
                                quantity = d.Order_qty.ToString()
                            }
                        }
                            };
                        }).ToList()
                    };

                    var result = HttpHelper.Post(url, ediDto.ToJsonString());
                    var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);

                    if (resp == null || resp.code != "0")
                    {
                        allSuccess = false;
                        break;
                    }
                    customerCode = "905",
                    materialCode = "YY",                              // ç‰©æ–™ç±»åž‹CODE
                    externalOrderNo = $"PDCK-{batchInfo.Id}",          // å¤–部出库单号
                    outOrderType = "20",                               // ç›˜ç‚¹å‡ºåº“单
                    priority = 1,
                    Is_cancel = 0,
                    details = new List<TowcsDto.ToeOutdiInDetail>
            {
                new TowcsDto.ToeOutdiInDetail
                {
                    batchNo = batchInfo.BatchNo,
                    productCode = batchInfo.MaterielCode,
                    productName = batchInfo.MaterielName,
                    productSpecifications = batchInfo.MaterielSpec,
                    quantity = (int)batchInfo.SupplyQuantity,
                    //stocktakingDetails = new List<TowcsDto.ToOutediInStock>
                    //{
                    //    // ç›˜ç‚¹æ˜Žç»†å¯æ ¹æ®å®žé™…托盘拆分；此处示例仅1条
                    //    new TowcsDto.ToOutediInStock
                    //    {
                    //        palletCode = "FC00001",
                    //        quantity = batchInfo.SupplyQuantity.ToString()
                    //    }
                    //}
                }
            }
                };

                return allSuccess
                    ? new WebResponseContent { Status = true, Message = "盘点成功" }
                    : new WebResponseContent { Status = false, Message = "盘点失败" };
                // 3️⃣ è°ƒç”¨æŽ¥å£
                string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
                var result = HttpHelper.Post(url, ediDto.ToJsonString());
                var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);

                // 4️⃣ å“åº”处理
                if (resp == null)
                    return response.Error("WCS æ— å“åº”");
                if (resp.code != "0")
                    return response.Error($"WCS返回失败: {resp.msg}");

                return response.OK("盘点出库下发成功");
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = ex.Message };
                return response.Error("盘点失败：" + ex.Message);
            }
        }

@@ -918,175 +830,7 @@
        }


        //public WebResponseContent CompleteAllOutOrders()
        //{
        //    var responseContent = new WebResponseContent();
        //    try
        //    {
        //        var orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
        //            .Where(o => o.OutStatus == "开始")
        //            .ToList();

        //        if (orders == null || !orders.Any())
        //        {
        //            return responseContent.OK("暂无需要处理的出库单");
        //        }

        //        int successCount = 0;
        //        int failCount = 0;
        //        int serverErrorCount = 0;

        //        foreach (var order in orders)
        //        {
        //            try
        //            {
        //                Db.Ado.BeginTran();

        //                var details = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
        //                    .Where(d => d.DeliveryOrderId == order.Id)
        //                    .ToList();

        //                var completedCount = details.Count(d => d.OotDetailStatus == "已完成");
        //                var totalCount = details.Count;

        //                if (totalCount > 0 && completedCount == totalCount)
        //                {
        //                    // æ›´æ–°çŠ¶æ€ä¸ºå·²å®Œæˆ
        //                    BaseDal.Db.Updateable<Dt_DeliveryOrder>()
        //                        .SetColumns(o => o.OutStatus == "已完成")
        //                        .Where(o => o.Id == order.Id)
        //                        .ExecuteCommand();

        //                    // è°ƒç”¨ä¸Šæ¸¸æŽ¥å£
        //                    var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
        //                    var requestDate = new
        //                    {
        //                        order_no = order.Out_no
        //                    };

        //                    string result;
        //                    try
        //                    {
        //                        result = HttpHelper.Post(url, requestDate.ToJsonString());
        //                    }
        //                    catch (Exception httpEx)
        //                    {
        //                        // HTTP请求异常（网络问题等）
        //                        Db.Ado.RollbackTran();
        //                        failCount++;
        //                        SendErrorToUpstream(3, "", $"网络请求失败: {httpEx.Message}", order.Out_no);
        //                        continue;
        //                    }

        //                    // âœ… æ£€æŸ¥æ˜¯å¦æ˜¯500错误页面
        //                    if (!string.IsNullOrEmpty(result) && result.Contains("500错误页面"))
        //                    {
        //                        Db.Ado.RollbackTran();
        //                        serverErrorCount++;
        //                        SendErrorToUpstream(5, "", "上游接口服务器内部错误(500)，请联系上游系统管理员", order.Out_no);
        //                        continue;
        //                    }

        //                    // âœ… æ£€æŸ¥æ˜¯å¦æ˜¯HTML响应
        //                    if (!string.IsNullOrEmpty(result) && result.Trim().StartsWith("<"))
        //                    {
        //                        Db.Ado.RollbackTran();
        //                        failCount++;
        //                        SendErrorToUpstream(4, "", "上游接口返回非JSON格式响应", order.Out_no);
        //                        continue;
        //                    }

        //                    // âœ… å®‰å…¨è§£æžJSON
        //                    UpstreamOrderResponse response;
        //                    try
        //                    {
        //                        response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
        //                    }
        //                    catch (JsonReaderException jsonEx)
        //                    {
        //                        Db.Ado.RollbackTran();
        //                        failCount++;
        //                        SendErrorToUpstream(4, "", $"上游接口返回数据格式错误: {jsonEx.Message}", order.Out_no);
        //                        continue;
        //                    }

        //                    if (response.resultCode == "0")
        //                    {
        //                        // æˆåŠŸå¤„理逻辑...
        //                        var orderHistory = new Dt_DeliveryOrder_Hty
        //                        {
        //                            Id = order.Id,
        //                            Out_no = order.Out_no,
        //                            Out_type = order.Out_type,
        //                            Client_no = order.Client_no,
        //                            Client_name = order.Client_name,
        //                            Account_time = order.Account_time,
        //                            Warehouse_no = order.Warehouse_no,
        //                            OutStatus = "已完成",
        //                            Details = details.Select(d => new Dt_DeliveryOrderDetail
        //                            {
        //                                Id = d.Id,
        //                                DeliveryOrderId = d.DeliveryOrderId,
        //                                Reservoirarea = d.Reservoirarea,
        //                                Goods_no = d.Goods_no,
        //                                Order_qty = d.Order_qty,
        //                                Batch_num = d.Batch_num,
        //                                Exp_date = d.Exp_date,
        //                                OotDetailStatus = d.OotDetailStatus,
        //                                Status = d.Status
        //                            }).ToList()
        //                        };

        //                        var historyId = BaseDal.Db.Insertable(orderHistory).ExecuteReturnIdentity();

        //                        var detailHistories = details.Select(d => new Dt_DeliveryOrderDetail_Hty
        //                        {
        //                            Id = d.Id,
        //                            DeliveryOrderId = order.Id,
        //                            Reservoirarea = d.Reservoirarea,
        //                            Goods_no = d.Goods_no,
        //                            Order_qty = d.Order_qty,
        //                            Batch_num = d.Batch_num,
        //                            Exp_date = d.Exp_date,
        //                            OotDetailStatus = d.OotDetailStatus,
        //                            Status = d.Status
        //                        }).ToList();

        //                        BaseDal.Db.Insertable(detailHistories).ExecuteCommand();

        //                        BaseDal.Db.Deleteable<Dt_DeliveryOrderDetail>().Where(d => d.DeliveryOrderId == order.Id).ExecuteCommand();
        //                        BaseDal.Db.Deleteable<Dt_DeliveryOrder>().Where(o => o.Id == order.Id).ExecuteCommand();

        //                        Db.Ado.CommitTran();
        //                        successCount++;
        //                    }
        //                    else
        //                    {
        //                        Db.Ado.RollbackTran();
        //                        failCount++;
        //                        SendErrorToUpstream(4, "", $"上游接口返回失败: {response.resultMsg}", order.Out_no);
        //                    }
        //                }
        //                else
        //                {
        //                    Db.Ado.RollbackTran();
        //                }
        //            }
        //            catch (Exception ex)
        //            {
        //                Db.Ado.RollbackTran();
        //                failCount++;
        //                SendErrorToUpstream(1, "", ex.Message, order.Out_no);
        //            }
        //        }

        //        return responseContent.OK($"批量处理完成：成功 {successCount} å•ï¼Œå¤±è´¥ {failCount} å•ï¼ŒæœåŠ¡å™¨é”™è¯¯ {serverErrorCount} å•ã€‚");
        //    }
        //    catch (Exception ex)
        //    {
        //        return responseContent.Error("批量处理失败：" + ex.Message);
        //    }
        //}

        /// <summary>
        /// æŽ¨é€å¼‚常信息给上游系统 1.入库单接口；2.入库单报完成接口；3.出库单接口；4.出库报完成接口；5.药品基础信息同步接口；6.供应商信息接口；7.客户信息接口；8.库存查询接口
@@ -1115,33 +859,6 @@
            }
        }

        public WebResponseContent GetPdDeliveryOrders(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                int pageNo = saveModel.MainData["pageNo"].ObjToInt();
                string warehouseCode = saveModel.MainData["warehouseId"].ToString();
                string orderNo = saveModel.MainData["orderNo"].ToString();
                List<Dt_DeliveryOrder> dt_ReceiveOrders = new List<Dt_DeliveryOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "新建" || x.OutStatus == "开始") && x.Warehouse_no == warehouseCode && x.Out_type == "3").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "新建" || x.OutStatus == "开始" && x.Out_type == "3") && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);
            }
            catch (Exception)
            {

                throw;
            }
            return content;
        }

        public WebResponseContent GetDeliveryOrders(SaveModel saveModel)
        {
@@ -1158,7 +875,7 @@
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "新建" || x.OutStatus == "开始" && x.Out_type != "3") && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "新建" || x.OutStatus == "开始") && x.Out_type != "3" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);
@@ -1171,6 +888,13 @@
            return content;
        }

        /// <summary>
        /// æŸ¥è¯¢å‡ºåº“/盘点单详情 çœ‹å‡ºåº“单明细。
        /// </summary>
        /// <param name="pageNo"></param>
        /// <param name="orderNo"></param>
        /// <param name="isPick"></param>
        /// <returns></returns>
        public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
        {
            WebResponseContent content = new WebResponseContent();
@@ -1179,29 +903,34 @@
                cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "3");
            else
                cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "3");
            List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
            content.OK(data: cabinOrderDetails);
            List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList(); 
            content.OK(data: cabinOrderDetails); 
            return content;
        }
        public WebResponseContent MatPicking(SaveModel saveModel)

        public WebResponseContent OutFinish(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var LocationCode = saveModel.MainData["LocationCode"].ToString();
                var orderNo = saveModel.MainData["orderNo"].ToString();
                var batchNo = saveModel.MainData["batchNo"].ToString();
                var Inqty = saveModel.MainData["Inqty"].ObjToInt();
                var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
                Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == orderNo && x.Warehouse_no == warehouseCode && x.Out_type == "3").Includes(x => x.Details).First();
                if (cabinOrder == null) return WebResponseContent.Instance.Error($"盘点单已完成");
                Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
                if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"盘点单明细已完成");
                var LocationCode = saveModel.MainData["locationCode"].ToString();
                var TaskId = saveModel.MainData["taskId"].ObjToInt();
                Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());
                if (supplyTask == null) throw new Exception("当前出库任务已完成");
                if (supplyTask.LocationCode != LocationCode) throw new Exception($"当前出库货位【{LocationCode}】与任务分配货位不匹配");
                supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();

                Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
                if (cabinOrder == null) return WebResponseContent.Instance.Error($"出库单已完成");

                Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).First();
                if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"出库单明细已完成");
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
                if (materielInfo == null) return WebResponseContent.Instance.Error($"请维护物料编号【{cabinOrderDetail.Goods_no}】的物料信息");
                cabinOrderDetail.Order_Outqty += Inqty;
                cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
                if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
                    return WebResponseContent.Instance.Error($"实盘数量不可超出账面数量");
                    return WebResponseContent.Instance.Error($"出库数量不可超出单据数量");


                #region å¤„理出库单，货位，库存，库存批次信息
                _unitOfWorkManage.BeginTran();
@@ -1218,54 +947,51 @@
                {
                    _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
                }
                var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type == "3").Includes(x => x.Details).First();
                var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type != "3").Includes(x => x.Details).First();
                if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "已完成";
                if (cabinOrder.OutStatus == "已完成")
                    Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.自动完成);
                else
                    Repository.UpdateData(cabinOrder);
                Repository.UpdateData(cabinOrder);
                #endregion

                #region åº“å­˜
                Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == LocationCode);
                if (inventoryInfo == null) return WebResponseContent.Instance.Error($"未找到货位【{LocationCode}】的库存信息");
                inventoryInfo.SupplyQuantity += Inqty;
                _inventoryInfoService.UpdateData(inventoryInfo);
                inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
                if (inventoryInfo.StockQuantity <= 0)
                    _inventoryInfoService.DeleteData(inventoryInfo);
                else
                    _inventoryInfoService.UpdateData(inventoryInfo);
                #endregion

                #region ä»»åŠ¡è®°å½•
                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                #region è´§ä½
                var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
                if (location == null) return WebResponseContent.Instance.Error($"请维护货位编号【{LocationCode}】的货位信息");
                if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】已禁用，请恢复正常再使用");
                Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
                if (inventoryInfo1 == null)
                {
                    WarehouseCode = cabinOrderDetail.Reservoirarea,
                    BatchNo = inventoryInfo.BatchNo,
                    MaterielName = inventoryInfo.MaterielName,
                    MaterielCode = inventoryInfo.MaterielCode,
                    MaterielSpec = inventoryInfo.MaterielSpec,
                    TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
                    CreateDate = DateTime.Now,
                    Creater = App.User.UserName,
                    LocationCode = LocationCode,
                    OrderNo = cabinOrder.Out_no,
                    StockQuantity = inventoryInfo.StockQuantity,
                    SupplyQuantity = Inqty,
                    Remark = "盘点"
                };
                _supplyTaskService.AddData(supplyTask);
                    location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                    _basicService.LocationInfoService.UpdateData(location);
                }
                #endregion

                _supplyTaskService.UpdateData(supplyTask);

                #region åº“存批次
                Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
                if (inventory_Batch != null)
                {
                    inventory_Batch.SupplyQuantity += Inqty;
                    _inventory_BatchServices.UpdateData(inventory_Batch);
                    inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
                    if (inventory_Batch.StockQuantity <= 0)
                        _inventory_BatchServices.DeleteData(inventory_Batch);
                    else
                        _inventory_BatchServices.UpdateData(inventory_Batch);
                }
                #endregion

                _unitOfWorkManage.CommitTran();
                #endregion

                content.OK(cabinOrderDetail.Order_Outqty.ToString());
                content.OK();
            }
            catch (Exception ex)
            {
@@ -1274,7 +1000,14 @@
            }
            return content;
        }
        public WebResponseContent FeedbackOut(SaveModel saveModel)


        /// <summary>
        /// å¹³åº“人工拣料出库处理（即人工扫码出库时调用）
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        public WebResponseContent MatPicking(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -1345,6 +1078,7 @@
                    MaterielName = inventoryInfo.MaterielName,
                    MaterielCode = inventoryInfo.MaterielCode,
                    MaterielSpec = inventoryInfo.MaterielSpec,
                    TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                    CreateDate = DateTime.Now,
                    Creater = App.User.UserName,