优化权限配置

dengjunjie

2025-10-24 c42731f080a4873e298bfe8489b47993432d8404

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

@@ -1,5 +1,10 @@
using HslCommunication;
using MailKit.Search;
using Microsoft.Data.SqlClient;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using OfficeOpenXml.Style;
using Org.BouncyCastle.Asn1.X509;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -8,7 +13,9 @@
using WIDESEA_Common;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -35,8 +42,9 @@
        private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
        private readonly ISupplyTaskService _supplyTaskService;
        private readonly ICabinOrderServices _cabinOrderServices;
        private readonly ITacticsService _tacticsService;
        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, ICabinOrderServices cabinOrderServices) : base(BaseDal)
        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService) : base(BaseDal)
        {
            _basicService = basicService;
            _unitOfWorkManage = unitOfWorkManage;
@@ -45,148 +53,23 @@
            _inventory_BatchServices = inventory_BatchServices;
            _inventoryInfoService = inventoryInfoService;
            _cabinOrderServices = cabinOrderServices;
            _tacticsService = tacticsService;
        }

        /// <summary>
        /// èŽ·å–上游出库单 0成功1失败
        /// </summary>
        /// <param name="searchDate"></param>
        /// <returns></returns>
        //public WebResponseContent GetUpstreamOutOrder()
        //{
        //    var responseContent = new WebResponseContent();
        //    try
        //    {
        //        // è¯·æ±‚地址
        //        var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";

        //        //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
        //        //// è¯·æ±‚参数
        //        var requestData = new
        //        {
        //            //searchDate = SearchDate
        //            searchDate = "2022-10-10 20:45:16"  // æ­£ç¡®çš„格式
        //        };
        //        //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
        //        // å‘起请求
        //        var result = HttpHelper.Post(url, requestData.ToJsonString());

        //        // ååºåˆ—化
        //        var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

        //        if (response.resultCode != "0")
        //        {
        //            SendErrorToUpstream(3, "", response.resultMsg ?? "上游接口返回失败", "");
        //            return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
        //        }

        //        if (response.data == null || !response.data.Any())
        //        {
        //            return responseContent.OK("无新出库单数据");
        //        }
        //        // èŽ·å–所有已存在的出库单号
        //        var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
        //            .Select(x => x.Out_no)
        //            .ToList();

        //        // è¿‡æ»¤æŽ‰å·²å­˜åœ¨çš„出库单
        //        var newOutOrders = response.data
        //            .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))//order_no出库单号
        //            .ToList();

        //        if (!newOutOrders.Any())
        //        {
        //            return responseContent.OK("所有出库单已存在，无需新增");
        //        }
        //        Db.Ado.BeginTran();
        //        try
        //        {
        //            List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
        //            ////存储出库单号
        //            //List<string> orderNos = new List<string>();

        //            foreach (var outorder in newOutOrders)
        //            {
        //                var entityOrder = new Dt_DeliveryOrder
        //                {
        //                    Out_no = outorder.order_no,
        //                    Out_type = outorder.order_type,
        //                    Client_no = outorder.client_no,
        //                    Client_name = outorder.client_name,
        //                    Account_time = outorder.account_time,
        //                    Warehouse_no=outorder.warehouse_no,
        //                    OutStatus = "未完成",
        //                    //Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
        //                    //{
        //                    //    // InsertNav ä¼šè‡ªåŠ¨è®¾ç½®å…³è”字段 DeliveryOrderId
        //                    //    Goods_no = d.goods_no,
        //                    //    Order_qty = d.order_qty,
        //                    //    Batch_num = d.batch_num,
        //                    //    Exp_date = d.exp_date,
        //                    //    OotDetailStatus = "新建",
        //                    //    Status = outorder.warehouse_no == "001" ? 0 : 2, //如果是001房那么将状态设置为0，2为人工处理
        //                    //}).ToList()
        //                };
        //                #region æ ¹æ®å‡ºåº“单详情查找物料名称、批次的库存信息(Dt_InventoryInfo)；根据先入先出,CreateDate
        //                //根据物料名称查找物料信息
        //                foreach (var item in outorder.details)
        //                {
        //                    // å°†ä¸Šæ¸¸å‡ºåº“数量转为正数
        //                    item.order_qty = Math.Abs(item.order_qty);
        //                    var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
        //                        .Where(m => m.Goods_no == item.goods_no)
        //                        .First();


        //                }

        //                //根据箱规判断是否有散件，计算出散件数量和整件数

        //                //根据入库时间分组，有散件就优先分配立库数量，整件优先分配平库数量


        //                #endregion
        //                _DeliveryOrders.Add(entityOrder);

        //            };

        //            // ä½¿ç”¨ InsertNav ä¸€æ¬¡æ€§æ’入主表和子表数据
        //            BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();

        //            // è¿™é‡Œå¯ä»¥æ·»åŠ ä¸‹å‘到 WCS çš„逻辑
        //            // var result = EdiOut(); // å‘给下游

        //            Db.Ado.CommitTran();
        //            return responseContent.OK("同步出库单成功");
        //        }
        //        catch (Exception ex)
        //        {
        //            Db.Ado.RollbackTran();
        //            SendErrorToUpstream(3, "", ex.Message, "");
        //            return responseContent.Error("同步失败: " + ex.Message);
        //        }
        //    }
        //    catch (Exception ex)
        //    {
        //        // å…¨å±€å¼‚常时，也推送异常给上游
        //        SendErrorToUpstream(3, "", ex.Message, "");
        //        return responseContent.Error("同步失败: " + ex.Message);
        //    }
        //}



        public WebResponseContent GetUpstreamOutOrder()
        {
            var responseContent = new WebResponseContent();
            try
            {
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";

                //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
                if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //// è¯·æ±‚参数
                var requestData = new
                {
                    searchDate = "2022-10-10 20:45:16"
                    searchDate = SearchDate
                    //searchDate = "2022-10-10 20:45:16"  // æ­£ç¡®çš„格式
                };
                SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");

                var result = HttpHelper.Post(url, requestData.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
@@ -212,6 +95,8 @@
                    .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
                    .ToList();

                List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();

                if (!newOutOrders.Any())
                {
                    return responseContent.OK("所有出库单已存在，无需新增");
@@ -221,530 +106,215 @@
                try
                {
                    List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
                    List<string> orderNos = new List<string>();

                    foreach (var outorder in newOutOrders)
                    {
                        var entityOrder = new Dt_DeliveryOrder
                        bool skipOrder = false; // æ ‡è®°æ˜¯å¦è·³è¿‡è¯¥å‡ºåº“单

                        // å¦‚果这个出库单类型不等于1，属于出库退货（要入货上游传过来的数量为负数）
                        if (outorder.order_type != "1")
                        {
                            Out_no = outorder.order_no,
                            Out_type = outorder.order_type,
                            Client_no = outorder.client_no,
                            Client_name = outorder.client_name,
                            Account_time = outorder.account_time,
                            Warehouse_no = outorder.warehouse_no,
                            OutStatus = "未完成",
                            Details = new List<Dt_DeliveryOrderDetail>()
                        };

                        // éåŽ†å‡ºåº“明细
                        foreach (var item in outorder.details)
                        {
                            //  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)
                                .First();

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

                            decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;

                            //  3️⃣ è®¡ç®—整件与散件数量
                            var fullBoxes = (int)(orderQty / boxQty);   // æ•´ä»¶ç®±æ•°
                            var partialQty = orderQty % boxQty;         // æ•£ä»¶æ•°é‡

                            // è‹¥ä¸Šæ¸¸ç»™äº†æ‰¹æ¬¡å·ï¼Œåˆ™ä¼˜å…ˆåŒ¹é…
                            string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;

                            // helper: æŸ¥è¯¢åº“存函数（按入库时间升序）
                            Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
                            {
                                var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                                    .Where(i => i.MaterielCode == item.goods_no &&
                                                (i.StockQuantity - i.OutboundQuantity) > 0 &&
                                                i.StockStatus == stockStatus);

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

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

                            // 4️⃣分配散件（优先立库 Status=0）
                            decimal remainingPartial = partialQty;
                            if (remainingPartial > 0)
                            {
                                var invList_ly = queryInventoryByStockStatus(1);
                                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
                                    {
                                        Goods_no = item.goods_no,
                                        Order_qty = use,
                                        Batch_num = inv.BatchNo,
                                        Exp_date = inv.ValidityPeriod,
                                        OotDetailStatus = "新建",
                                        Status = 0, //立库
                                        Reservoirarea = inv.LocationCode
                                    };
                                    entityOrder.Details.Add(detail);

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

                                    remainingPartial -= use;
                                }

                                // ç«‹åº“不够 â†’ å¹³åº“è¡¥ (Status=2)
                                if (remainingPartial > 0)
                                {
                                    var invList_pk = queryInventoryByStockStatus(2);
                                    foreach (var inv in invList_pk)
                                    {
                                        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
                                        {
                                            Goods_no = item.goods_no,
                                            Order_qty = use,
                                            Batch_num = inv.BatchNo,
                                            Exp_date = inv.ValidityPeriod,
                                            OotDetailStatus = "新建",
                                            Status = 2, //平库
                                            Reservoirarea = inv.LocationCode
                                        };
                                        entityOrder.Details.Add(detail);

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

                                        remainingPartial -= use;
                                    }
                                }

                                if (remainingPartial > 0)
                                {
                                    SendErrorToUpstream(3, "", $"出库单[{outorder.order_no}]物料[{item.goods_no}]散件库存不足，未分配：{remainingPartial}", "");
                                }
                            }

                            //分配整件（优先平库 Status=2）
                            int remainingFullBoxes = fullBoxes;
                            if (remainingFullBoxes > 0)
                            {
                                var invList_pk = queryInventoryByStockStatus(2);
                                foreach (var inv in invList_pk)
                                {
                                    if (remainingFullBoxes <= 0) break;

                                    decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
                                    if (available < boxQty) continue;

                                    int canProvideBoxes = (int)(available / boxQty);
                                    if (canProvideBoxes <= 0) continue;

                                    int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
                                    decimal useQty = useBoxes * boxQty;

                                    var detail = new Dt_DeliveryOrderDetail
                                    {
                                        Goods_no = item.goods_no,
                                        Order_qty = useQty,
                                        Batch_num = inv.BatchNo,
                                        Exp_date = inv.ValidityPeriod,
                                        OotDetailStatus = "新建",
                                        Status = 2, //平库
                                        Reservoirarea = inv.LocationCode
                                    };
                                    entityOrder.Details.Add(detail);

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

                                    remainingFullBoxes -= useBoxes;
                                }

                                // å¹³åº“不够 â†’ ç«‹åº“è¡¥ (Status=1)
                                if (remainingFullBoxes > 0)
                                {
                                    var invList_ly = queryInventoryByStockStatus(1);
                                    foreach (var inv in invList_ly)
                                    {
                                        if (remainingFullBoxes <= 0) break;

                                        decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
                                        if (available < boxQty) continue;

                                        int canProvideBoxes = (int)(available / boxQty);
                                        if (canProvideBoxes <= 0) continue;

                                        int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
                                        decimal useQty = useBoxes * boxQty;

                                        var detail = new Dt_DeliveryOrderDetail
                                        {
                                            Goods_no = item.goods_no,
                                            Order_qty = useQty,
                                            Batch_num = inv.BatchNo,
                                            Exp_date = inv.ValidityPeriod,
                                            OotDetailStatus = "新建",
                                            Status = 0, //立库（补整箱）
                                            Reservoirarea = inv.LocationCode
                                        };
                                        entityOrder.Details.Add(detail);

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

                                        remainingFullBoxes -= useBoxes;
                                    }
                                }

                                if (remainingFullBoxes > 0)
                                {
                                    decimal unfilledQty = remainingFullBoxes * boxQty;
                                    SendErrorToUpstream(3, "", $"出库单[{outorder.order_no}]物料[{item.goods_no}]整箱库存不足，未分配数量：{unfilledQty}", "");
                                }
                            }
                            // åˆ›å»ºå‡ºåº“退货单 - è¿™é‡Œéœ€è¦æ ¹æ®ä¸šåŠ¡é€»è¾‘实现
                            // æš‚时跳过或实现退货逻辑
                            continue;
                        }

                        _DeliveryOrders.Add(entityOrder);
                    }

                    // æ’入主表+明细
                    BaseDal.Db.InsertNav(_DeliveryOrders)
                        .Include(x => x.Details)
                        .ExecuteCommand();

                    Db.Ado.CommitTran();
                    return responseContent.OK("同步出库单成功");
                }
                catch (Exception ex)
                {
                    Db.Ado.RollbackTran();
                    SendErrorToUpstream(3, "", ex.Message, "");
                    return responseContent.Error("同步失败: " + ex.Message);
                }
            }
            catch (Exception ex)
            {
                SendErrorToUpstream(3, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }

        /// <summary>
        /// è¿‡æ»¤æ²¡æœ‰å¯¹å•†å“è¿›è¡Œç»´æŠ¤çš„出库单进行过滤
        /// </summary>
        /// <returns></returns>
        public WebResponseContent GetUpstreamOutOrder2()
        {
            var responseContent = new WebResponseContent();
            try
            {
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";

                var requestData = new
                {
                    searchDate = "2022-10-10 20:45:16"
                };

                var result = HttpHelper.Post(url, requestData.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

                if (response.resultCode != "0")
                {
                    SendErrorToUpstream(3, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }

                if (response.data == null || !response.data.Any())
                {
                    return responseContent.OK("无新出库单数据");
                }

                // å·²å­˜åœ¨å‡ºåº“单号
                var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
                    .Select(x => x.Out_no)
                    .ToList();

                // æ–°å‡ºåº“单
                var newOutOrders = response.data
                    .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
                    .ToList();

                if (!newOutOrders.Any())
                {
                    return responseContent.OK("所有出库单已存在，无需新增");
                }

                Db.Ado.BeginTran();
                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
                        else if (outorder.order_type == "1") // æ­£å¸¸å‡ºåº“单
                        {
                            Out_no = outorder.order_no,
                            Out_type = outorder.order_type,
                            Client_no = outorder.client_no,
                            Client_name = outorder.client_name,
                            Account_time = outorder.account_time,
                            Warehouse_no = outorder.warehouse_no,
                            OutStatus = "未完成",
                            Details = new List<Dt_DeliveryOrderDetail>()
                        };

                        // éåŽ†å‡ºåº“明细
                        foreach (var item in outorder.details)
                        {
                            //  1️⃣ è½¬ä¸ºæ­£æ•°ï¼ˆä¸Šæ¸¸å¯èƒ½ä¼ è´Ÿæ•°ï¼‰
                            item.order_qty = Math.Abs(item.order_qty);
                            decimal orderQty = (decimal)item.order_qty;

                            //  2️⃣ æŸ¥ç‰©æ–™åŸºç¡€ä¿¡æ¯ï¼ˆèŽ·å–箱规）
                            var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
                                .Where(m => m.MaterielCode == item.goods_no)
                                .First();
                            //如果物料信息不存在，跳过整个入库单
                            if (medication == null)
                            CreateOutboundOrder(outorder);//创建出库单、处理库存、添加出库任务
                            // æŽ’除特殊药品,特殊药品直接插入
                            if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
                            {
                                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;
                            }

                            decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;

                            //  3️⃣ è®¡ç®—整件与散件数量
                            var fullBoxes = (int)(orderQty / boxQty);   // æ•´ä»¶ç®±æ•°
                            var partialQty = orderQty % boxQty;         // æ•£ä»¶æ•°é‡

                            // è‹¥ä¸Šæ¸¸ç»™äº†æ‰¹æ¬¡å·ï¼Œåˆ™ä¼˜å…ˆåŒ¹é…
                            string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;

                            // helper: æŸ¥è¯¢åº“存函数（按入库时间升序）
                            // å®šä¹‰ä¸€ä¸ªå§”托变量：输入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();  // æŒ‰å…¥åº“时间排序
                            };
                            // 4️⃣分配散件（优先立库 Status=0）
                            decimal remainingPartial = partialQty;
                            if (remainingPartial > 0)
                            {
                                var invList_ly = queryInventoryByStockStatus(0);
                                foreach (var inv in invList_ly)
                                var entityOrder = new Dt_DeliveryOrder
                                {
                                    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
                                    Out_no = outorder.order_no,
                                    Out_type = outorder.order_type,
                                    Client_no = outorder.client_no,
                                    Client_name = outorder.client_name,
                                    Account_time = outorder.account_time,
                                    Warehouse_no = outorder.warehouse_no,
                                    OutStatus = "新建",
                                    Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
                                    {
                                        Goods_no = item.goods_no,
                                        Order_qty = use,
                                        Batch_num = inv.BatchNo,
                                        Exp_date = inv.ValidityPeriod,
                                        Goods_no = d.goods_no,
                                        Order_qty = Math.Abs(d.order_qty), // å‡ºåº“数量转为正数
                                        Batch_num = d.batch_num,
                                        Exp_date = d.exp_date,
                                        OotDetailStatus = "新建",
                                        Status = 0, //立库
                                        Reservoirarea = inv.LocationCode
                                    };
                                    entityOrder.Details.Add(detail);

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

                                    remainingPartial -= use;
                                }

                                // ç«‹åº“不够 â†’ å¹³åº“è¡¥ (Status=2)
                                if (remainingPartial > 0)
                                {
                                    var invList_pk = queryInventoryByStockStatus(2);
                                    foreach (var inv in invList_pk)
                                    {
                                        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
                                        {
                                            Goods_no = item.goods_no,
                                            Order_qty = use,
                                            Batch_num = inv.BatchNo,
                                            Exp_date = inv.ValidityPeriod,
                                            OotDetailStatus = "新建",
                                            Status = 2, //平库
                                            Reservoirarea = inv.LocationCode
                                        };
                                        entityOrder.Details.Add(detail);

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

                                        remainingPartial -= use;
                                    }
                                }

                                if (remainingPartial > 0)
                                {
                                    SendErrorToUpstream(3, "", $"出库单[{outorder.order_no}]物料[{item.goods_no}]散件库存不足，未分配：{remainingPartial}", "");
                                }
                                        Status = 2, // pad平库，无需同步
                                    }).ToList()
                                };
                                _DeliveryOrders.Add(entityOrder);
                            }

                            //分配整件（优先平库 Status=2）
                            int remainingFullBoxes = fullBoxes;
                            if (remainingFullBoxes > 0)
                            else  // å¸¸è§„药品001房给立库,要是有整箱就给平库
                            {
                                var invList_pk = queryInventoryByStockStatus(2);
                                foreach (var inv in invList_pk)
                                var entityOrder = new Dt_DeliveryOrder
                                {
                                    if (remainingFullBoxes <= 0) break;
                                    Out_no = outorder.order_no,
                                    Out_type = outorder.order_type,
                                    Client_no = outorder.client_no,
                                    Client_name = outorder.client_name,
                                    Account_time = outorder.account_time,
                                    Warehouse_no = outorder.warehouse_no,
                                    OutStatus = "新建",
                                    Details = new List<Dt_DeliveryOrderDetail>()
                                };

                                    decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
                                    if (available < boxQty) continue;

                                    int canProvideBoxes = (int)(available / boxQty);
                                    if (canProvideBoxes <= 0) continue;

                                    int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
                                    decimal useQty = useBoxes * boxQty;

                                    var detail = new Dt_DeliveryOrderDetail
                                    {
                                        Goods_no = item.goods_no,
                                        Order_qty = useQty,
                                        Batch_num = inv.BatchNo,
                                        Exp_date = inv.ValidityPeriod,
                                        OotDetailStatus = "新建",
                                        Status = 2, //平库
                                        Reservoirarea = inv.LocationCode
                                    };
                                    entityOrder.Details.Add(detail);

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

                                    remainingFullBoxes -= useBoxes;
                                }

                                // å¹³åº“不够 â†’ ç«‹åº“è¡¥ (Status=1)
                                if (remainingFullBoxes > 0)
                                // éåŽ†å‡ºåº“明细
                                foreach (var item in outorder.details)
                                {
                                    var invList_ly = queryInventoryByStockStatus(1);
                                    foreach (var inv in invList_ly)
                                    // å°†ä¸Šæ¸¸å‡ºåº“数量转为正数
                                    decimal orderQty = Math.Abs((decimal)item.order_qty);

                                    #region æ ¹æ®ç‰©æ–™ç¼–码查询物料信息
                                    var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
                                        .Where(m => m.MaterielCode == item.goods_no)
                                        .First();

                                    // å¦‚果物料信息不存在，跳过整个出库单
                                    if (medication == null)
                                    {
                                        if (remainingFullBoxes <= 0) break;

                                        decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
                                        if (available < boxQty) continue;

                                        int canProvideBoxes = (int)(available / boxQty);
                                        if (canProvideBoxes <= 0) continue;

                                        int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
                                        decimal useQty = useBoxes * boxQty;

                                        var detail = new Dt_DeliveryOrderDetail
                                        {
                                            Goods_no = item.goods_no,
                                            Order_qty = useQty,
                                            Batch_num = inv.BatchNo,
                                            Exp_date = inv.ValidityPeriod,
                                            OotDetailStatus = "新建",
                                            Status = 0, //立库（补整箱）
                                            Reservoirarea = inv.LocationCode
                                        };
                                        entityOrder.Details.Add(detail);

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

                                        remainingFullBoxes -= useBoxes;
                                        skipOrder = true;
                                        Console.WriteLine($"跳出处库单 {outorder.order_no}，原因：未找到商品 [{item.goods_no}] çš„物料信息。");
                                        break;
                                    }

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

                                    /// æ ¹æ®ç‰©æ–™ä¿¡æ¯å¤§å°ä»¶å±žæ€§åŒºåˆ†æ˜¯å¦ä»Žç«‹åº“出库 // å¤§ä»¶ä»Žå¹³åº“出库
                                    if (medication.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart) // å¦‚果物料是大件
                                    {
                                        var orderDetail = new Dt_DeliveryOrderDetail()
                                        {
                                            Reservoirarea = outorder.warehouse_no,
                                            Goods_no = item.goods_no,
                                            Order_qty = orderQty,
                                            Batch_num = item.batch_num,
                                            Exp_date = item.exp_date,
                                            OotDetailStatus = "新建",
                                            Status = 2 // å¹³åº“，无需同步
                                        };
                                        entityOrder.Details.Add(orderDetail);
                                    }
                                    else
                                    {
                                        Dt_DeliveryOrderDetail orderDetail = null;

                                        // è®¡ç®—整箱和散件数量
                                        var ys = orderQty % medication.BoxQty; // ä¸èƒ½æ•´é™¤ç®±è§„的散件数 
                                        var xs = (int)(orderQty / medication.BoxQty); // æ•´ç®±æ•°é‡ï¼ˆä¿ç•™æ•´æ•°ï¼‰

                                        #region ä»Žç«‹åº“出库散件

                                        #region åˆ¤æ–­æ˜¯å¦æœ‰æ•£ä»¶
                                        if (ys > 0 && medication.Business_qty >= ys)
                                        {
                                            orderDetail = new Dt_DeliveryOrderDetail()
                                            {
                                                Reservoirarea = outorder.warehouse_no,
                                                Goods_no = item.goods_no,
                                                Order_qty = ys,
                                                Batch_num = item.batch_num,
                                                Exp_date = item.exp_date,
                                                OotDetailStatus = "新建",
                                                Status = 0 // ç«‹åº“，需要同步给WCS
                                            };
                                            medication.Business_qty -= ys;
                                        }
                                        #endregion

                                        #region åˆ¤æ–­ç«‹åº“库存是否足够出整箱
                                        while (medication.Business_qty >= medication.BoxQty && xs > 0)
                                        {
                                            xs--;
                                            if (orderDetail == null)
                                            {
                                                orderDetail = new Dt_DeliveryOrderDetail()
                                                {
                                                    Reservoirarea = outorder.warehouse_no,
                                                    Goods_no = item.goods_no,
                                                    Order_qty = medication.BoxQty,
                                                    Batch_num = item.batch_num,
                                                    Exp_date = item.exp_date,
                                                    OotDetailStatus = "新建",
                                                    Status = 0 // ç«‹åº“
                                                };
                                                medication.Business_qty -= medication.BoxQty;
                                            }
                                            else
                                            {
                                                orderDetail.Order_qty += medication.BoxQty;
                                                medication.Business_qty -= medication.BoxQty;
                                            }
                                        }

                                        if (orderDetail != null)
                                            entityOrder.Details.Add(orderDetail);
                                        #endregion

                                        #endregion

                                        #region å‰©ä½™æ•´ä»¶ä»Žå¹³åº“出库
                                        if (xs > 0)
                                        {
                                            orderDetail = new Dt_DeliveryOrderDetail()
                                            {
                                                Reservoirarea = outorder.warehouse_no,
                                                Goods_no = item.goods_no,
                                                Order_qty = medication.BoxQty * xs,
                                                Batch_num = item.batch_num,
                                                Exp_date = item.exp_date,
                                                OotDetailStatus = "新建",
                                                Status = 2 // å¹³åº“
                                            };
                                            entityOrder.Details.Add(orderDetail);
                                        }
                                        #endregion
                                    }

                                    // æ›´æ–°ç‰©æ–™ä¿¡æ¯
                                    _basicService.MaterielInfoService.Repository.UpdateData(medication);

                                }
                                // â—如果跳过该单，则直接continue，不保存

                                // å¦‚果跳过该单，则直接continue，不保存
                                if (skipOrder)
                                {
                                    Console.WriteLine($"跳过入库单 {outorder.order_no}，因为存在未定义物料属性的商品。");
                                    Console.WriteLine($"跳出处库单 {outorder.order_no}，因为存在未定义物料属性的商品。");
                                    continue;
                                }

                                if (remainingFullBoxes > 0)
                                // ç¡®ä¿å‡ºåº“单有明细才添加
                                if (entityOrder.Details.Any())
                                {
                                    decimal unfilledQty = remainingFullBoxes * boxQty;
                                    SendErrorToUpstream(3, "", $"出库单[{outorder.order_no}]物料[{item.goods_no}]整箱库存不足，未分配数量：{unfilledQty}", "");
                                    _DeliveryOrders.Add(entityOrder);
                                    orderNos.Add(outorder.order_no);
                                }

                            }
                        }

                        _DeliveryOrders.Add(entityOrder);
                    }

                    // æ’入主表+明细
                    BaseDal.Db.InsertNav(_DeliveryOrders)
                        .Include(x => x.Details)
                        .ExecuteCommand();
                    // æ‰¹é‡æ’入出库单和明细
                    if (_DeliveryOrders.Any())
                    {
                        BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
                    }
                    //下发出库单任务给wcs


                    Db.Ado.CommitTran();
                    return responseContent.OK("同步出库单成功");
                    var tex = CreateSupplyTask(order_no);
                    if (!tex)
                    {
                        return responseContent.Error("创建供应任务失败");
                    }
                    return responseContent.OK($"同步出库单成功，共{_DeliveryOrders.Count}条");
                }
                catch (Exception ex)
                {
@@ -759,6 +329,181 @@
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
        /// <summary>
        /// åˆ›å»ºå‡ºåº“单
        /// </summary>
        /// <param name="outorder"></param>
        /// <returns></returns>
        public WebResponseContent CreateOutboundOrder(UpstramOutOrderInfo outorder)
        {
            WebResponseContent webResponseContent = new WebResponseContent();
            try
            {
                Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "出库策略");
                if (outorder.warehouse_no == WarehouseEnum.麻精库.ObjToInt().ToString("000") || outorder.warehouse_no == WarehouseEnum.冷冻库.ObjToInt().ToString("000"))
                {
                    #region æ·»åŠ å‡ºåº“单
                    var entityOrder = new Dt_DeliveryOrder
                    {
                        Out_no = outorder.order_no,
                        Out_type = outorder.order_type,
                        Client_no = outorder.client_no,
                        Client_name = outorder.client_name,
                        Account_time = outorder.account_time,
                        Warehouse_no = outorder.warehouse_no,
                        OutStatus = "新建",
                        Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
                        {
                            Reservoirarea = outorder.warehouse_no,
                            Goods_no = d.goods_no,
                            Order_qty = Math.Abs(d.order_qty), // å‡ºåº“数量转为正数
                            Batch_num = d.batch_num,
                            Exp_date = d.exp_date,
                            OotDetailStatus = "新建",
                            Status = 2, // pad平库，无需同步
                        }).ToList()
                    };
                    BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
                    #endregion
                    List<Dt_InventoryInfo> dt_InventoryInfos = new List<Dt_InventoryInfo>();
                    #region å¤„理库存、添加出库任务
                    foreach (var item in entityOrder.Details)
                    {
                        dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == item.Reservoirarea);
                        #region æŒ‰å‡ºåº“策略查找库存
                        if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
                            dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
                        else
                            dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
                        #endregion
                        var Order_qty = item.Order_qty;
                        foreach (var InventoryInfo in dt_InventoryInfos)
                        {
                            if (InventoryInfo.AvailableQuantity < Order_qty)
                            {

                            }
                        }
                    }
                    #endregion
                }
                else
                {

                }
            }
            catch (Exception ex)
            {
                webResponseContent.Error(ex.Message);
            }
            return webResponseContent;
        }
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“单任务
        /// </summary>
        /// <param name="order_no">出库单号</param>
        /// <returns></returns>
        private bool CreateSupplyTask(List<string> order_no)
        {
            try
            {
                // å…ˆèŽ·å–符合条件的主表数据
                var mainOrders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
                    .Where(x => order_no.Contains(x.Out_no))
                    .ToList();

                // èŽ·å–所有主表ID
                var mainOrderIds = mainOrders.Select(x => x.Id).ToList();

                // ç›´æŽ¥æŸ¥è¯¢å­è¡¨æ•°æ®
                List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
                    .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "新建")
                    .ToList();

                // èŽ·å–所有需要查询的物料编码
                var materielCodes = filteredDetails.Select(x => x.Goods_no).Distinct().ToList();

                // æ‰¹é‡æŸ¥è¯¢ç‰©æ–™ä¿¡æ¯
                var materielList = BaseDal.Db.Queryable<Dt_MaterielInfo>()
                    .Where(x => materielCodes.Contains(x.MaterielCode))
                    .ToList();

                List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();

                foreach (var item in filteredDetails)
                {
                    // æ ¹æ®å­è¡¨ç‰©æ–™ç¼–码查询物料信息
                    var medication = materielList.FirstOrDefault(x => x.MaterielCode == item.Goods_no);

                    // æŸ¥æ‰¾å¯¹åº”的主表信息
                    var mainOrder = mainOrders.FirstOrDefault(x => x.Id == item.DeliveryOrderId);
                    //随机生成任务编号加时间戳


                    if (mainOrder == null) continue;

                    var location = Db.Queryable<Dt_InventoryInfo>()
                    .Where(x => x.MaterielCode == ""//materielCode
                             && x.BatchNo == ""//batchNo
                             && x.StockQuantity > 0)
                    .OrderBy(x => x.InDate) // æŒ‰å…¥åº“时间排序
                    .First();

                    var supplyTask = new Dt_SupplyTask
                    {
                        TaskNum = GenerateTaskNumber(),
                        PalletCode = "0",
                        BatchNo = item.Batch_num,
                        MaterielCode = item.Goods_no,
                        MaterielName = medication?.MaterielName, // å¦‚果物料信息不存在，使用子表的物料名称
                        MaterielSpec = medication?.MaterielSpec, // å¦‚果物料信息不存在，使用子表的物料规格
                        TaskType = 0,
                        TaskStatus = item.Status == 0 ? 0 : 1,
                        WarehouseCode = mainOrder.Warehouse_no,
                        LocationCode = item.Status == 0 ? "立库" : "平库",
                        StockQuantity = item.Order_qty, // å‡è®¾å­è¡¨æœ‰Quantity字段
                        SupplyQuantity = 0,
                        OrderNo = mainOrder.Out_no,
                        Dispatchertime = DateTime.Now,
                        Remark = ""
                    };

                    supplyTasks.Add(supplyTask);
                }

                // æ‰¹é‡æ’入供应任务
                if (supplyTasks.Any())
                {
                    return BaseDal.Db.Insertable(supplyTasks).ExecuteCommand() > 0;
                }

                return false;
            }
            catch (Exception ex)
            {
                // è®°å½•æ—¥å¿—
                Console.WriteLine($"创建供应任务失败：{ex.Message}");
                return false;
            }
        }



        /// <summary>
        /// ç”Ÿæˆéšæœºä»»åŠ¡ç¼–号（随机数 + æ—¶é—´æˆ³ï¼‰
        /// </summary>
        /// <returns>任务编号</returns>
        private int GenerateTaskNumber()
        {
            // ç”Ÿæˆ4位随机数
            Random random = new Random(Guid.NewGuid().GetHashCode());
            int randomNum = random.Next(1000, 9999); // 1000-9999之间的随机数


            // ç»„合成任务编号：TASK + æ—¶é—´æˆ³ + éšæœºæ•°
            return randomNum;
        }


        /// <summary>
        /// å‡ºåº“单推送给 WCS
@@ -771,7 +516,7 @@
            {
                // 1. æŸ¥è¯¢ç¬¦åˆæ¡ä»¶çš„订单（表头=新建 && åŒ…含有效明细）
                var outOrders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
                    .Where(o => o.OutStatus == "新建")
                    .Where(o => o.OutStatus == "新建" && o.Warehouse_no == WarehouseEnum.立库.ObjToInt().ToString("000"))
                    .Includes(o => o.Details, d => d.MedicineGoods)
                    .ToList();

@@ -805,7 +550,7 @@
                            customerCode = "905",
                            materialCode = materialCode,
                            externalOrderNo = order.Out_no,
                            outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "2" ? "20" : "30",
                            outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//出库单类型是1就是正常的，3就是盘点
                            priority = 1,
                            Is_cancel = 0,
                            details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
@@ -826,6 +571,8 @@

                        // 4. è°ƒç”¨æŽ¥å£
                        var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
                        //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";

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

@@ -839,10 +586,9 @@

                            // æ›´æ–°æ˜Žç»†çŠ¶æ€
                            BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
                              .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "已完成" })
                              .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "开始" })
                              .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
                              .ExecuteCommand();

                            Console.WriteLine($"订单 {order.Out_no} æŽ¨é€æˆåŠŸ");
                        }
                        else
@@ -946,135 +692,47 @@
            var responseContent = new WebResponseContent();
            try
            {
                // æŸ¥æ‰¾æ‰€æœ‰â€œå¼€å§‹â€çŠ¶æ€çš„出库单
                var orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
                    .Where(o => o.OutStatus == "开始")
                    .ToList();

                if (orders == null || !orders.Any())
                #region æŸ¥æ‰¾æ‰€æœ‰å·²å®Œæˆå‡ºåº“单
                var outorders = BaseDal.QueryData(x => x.OutStatus == "已完成").Select(x => x.Out_no).Distinct().ToList();
                foreach (var outorder in outorders)
                {
                    return responseContent.OK("暂无需要处理的出库单");
                }

                int successCount = 0;
                int failCount = 0;

                foreach (var order in orders)
                {
                    try
                    var Orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == outorder).Includes(x => x.Details).ToList();
                    if (!Orders.Where(x => x.OutStatus != "已完成").Any())
                    {
                        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.Ado.BeginTran();
                        BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        foreach (var item in Orders)
                        {
                            // æ›´æ–°çŠ¶æ€ä¸ºå·²å®Œæˆ
                            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
                            };
                            var result = HttpHelper.Post(url, requestDate.ToJsonString());
                            var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);

                            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);
                            }
                            _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                        }
                        var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
                        var requestDate = new
                        {
                            order_no = outorder
                        };
                        var result = HttpHelper.Post(url, requestDate.ToJsonString());
                        var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
                        if (response.resultCode == "0") BaseDal.Db.Ado.CommitTran();
                        else
                        {
                            // æœ‰æœªå®Œæˆæ˜Žç»†ï¼Œä¸æ›´æ–°
                            Db.Ado.RollbackTran();
                            BaseDal.Db.Ado.RollbackTran();
                            SendErrorToUpstream(4, "", $"上游接口返回失败: {response.resultMsg}", outorder);
                        }
                    }
                    catch (Exception ex)
                    {
                        Db.Ado.RollbackTran();
                        failCount++;
                        SendErrorToUpstream(1, "", ex.Message, order.Out_no);
                    }
                }
                #endregion

                return responseContent.OK($"批量处理完成：成功 {successCount} å•ï¼Œå¤±è´¥ {failCount} å•ã€‚");
                return responseContent.OK();
            }
            catch (Exception ex)
            {
                BaseDal.Db.Ado.RollbackTran();
                return responseContent.Error("批量处理失败：" + ex.Message);
            }
        }


    


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

        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;
        }

        /// <summary>
        /// æŸ¥è¯¢å‡ºåº“单列表
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        public WebResponseContent GetDeliveryOrders(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
@@ -1146,7 +782,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);
@@ -1159,6 +795,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();
@@ -1167,31 +810,50 @@
                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();
            //List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList(); 
            List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Status == 2).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}】与任务分配货位不匹配");
                OutTaskFinish(supplyTask);
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }

        public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {

                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 å¤„理出库单，货位，库存，库存批次信息

                #region å¤„理出库单，货位，库存，库存批次信息,出库任务
                _unitOfWorkManage.BeginTran();

                #region å‡ºåº“单
@@ -1200,70 +862,80 @@
                if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
                {
                    cabinOrderDetail.OotDetailStatus = "已完成";
                    _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.自动完成);
                    //_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.自动完成);
                }
                else
                {
                    _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();
                if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "已完成";
                if (cabinOrder.OutStatus == "已完成")
                    Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.自动完成);
                else
                    Repository.UpdateData(cabinOrder);
                _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
                var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "3").Includes(x => x.Details).First();
                if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "已完成").Any())
                    cabinOrder.OutStatus = "已完成";
                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);
                Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);
                if (inventoryInfo == null) return WebResponseContent.Instance.Error($"未找到货位【{supplyTask.LocationCode}】的库存信息");
                inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
                inventoryInfo.OutboundQuantity -= supplyTask.StockQuantity;
                if (inventoryInfo.StockQuantity <= 0)
                    _inventoryInfoService.DeleteData(inventoryInfo);
                else
                    _inventoryInfoService.UpdateData(inventoryInfo);
                #endregion

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

                //_supplyTaskService.UpdateData(supplyTask);
                supplyTask.TaskNum = cabinOrderDetail.Id;
                supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
                _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.人工完成);

                #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;
                    inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
                    if (inventory_Batch.StockQuantity <= 0)
                        _inventory_BatchServices.DeleteData(inventory_Batch);
                    else
                        _inventory_BatchServices.UpdateData(inventory_Batch);
                }
                #endregion

                if (supplyTask.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000"))
                    CreateAllocatInOut(materielInfo);//创建调拨任务
                _unitOfWorkManage.CommitTran();
                #endregion

                content.OK(cabinOrderDetail.Order_Outqty.ToString());
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            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