优化WCS与ERP交互逻辑

dengjunjie

2025-10-25 d5051e5293179c99df2e3489ad5f2f73f4061667

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

@@ -34,14 +34,13 @@
{
    public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
    {
        static string SearchDate = "";
        private readonly ICabinOrderServices _cabinOrderServices;
        private readonly IBasicService _basicService;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly IInventory_BatchServices _inventory_BatchServices;
        private readonly IInventoryInfoService _inventoryInfoService;
        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, ITacticsService tacticsService) : base(BaseDal)
@@ -55,280 +54,6 @@
            _cabinOrderServices = cabinOrderServices;
            _tacticsService = tacticsService;
        }
        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 = 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))
                    .ToList();

                List<string> order_no = newOutOrders.Select(x => x.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)
                    {
                        bool skipOrder = false; // æ ‡è®°æ˜¯å¦è·³è¿‡è¯¥å‡ºåº“单

                        // å¦‚果这个出库单类型不等于1，属于出库退货（要入货上游传过来的数量为负数）
                        if (outorder.order_type != "1")
                        {
                            // åˆ›å»ºå‡ºåº“退货单 - è¿™é‡Œéœ€è¦æ ¹æ®ä¸šåŠ¡é€»è¾‘实现
                            // æš‚时跳过或实现退货逻辑
                            continue;
                        }
                        else if (outorder.order_type == "1") // æ­£å¸¸å‡ºåº“单
                        {
                            CreateOutboundOrder(outorder);//创建出库单、处理库存、添加出库任务
                            // æŽ’除特殊药品,特殊药品直接插入
                            if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
                            {
                                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
                                    {
                                        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()
                                };
                                _DeliveryOrders.Add(entityOrder);
                            }
                            else  // å¸¸è§„药品001房给立库,要是有整箱就给平库
                            {
                                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 = new List<Dt_DeliveryOrderDetail>()
                                };

                                // éåŽ†å‡ºåº“明细
                                foreach (var item in outorder.details)
                                {
                                    // å°†ä¸Šæ¸¸å‡ºåº“数量转为正数
                                    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)
                                    {
                                        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，不保存
                                if (skipOrder)
                                {
                                    Console.WriteLine($"跳出处库单 {outorder.order_no}，因为存在未定义物料属性的商品。");
                                    continue;
                                }

                                // ç¡®ä¿å‡ºåº“单有明细才添加
                                if (entityOrder.Details.Any())
                                {
                                    _DeliveryOrders.Add(entityOrder);
                                    orderNos.Add(outorder.order_no);
                                }
                            }
                        }
                    }

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


                    Db.Ado.CommitTran();
                    var tex = CreateSupplyTask(order_no);
                    if (!tex)
                    {
                        return responseContent.Error("创建供应任务失败");
                    }
                    return responseContent.OK($"同步出库单成功，共{_DeliveryOrders.Count}条");
                }
                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>
@@ -340,7 +65,10 @@
            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 ç‰¹æ®Šåº“房出库
                string WareCodeMJ = WarehouseEnum.麻精库.ObjToInt().ToString("000");
                string WareCodeLD = WarehouseEnum.冷冻库.ObjToInt().ToString("000");
                if (outorder.warehouse_no == WareCodeMJ || outorder.warehouse_no == WareCodeLD)
                {
                    #region æ·»åŠ å‡ºåº“单
                    var entityOrder = new Dt_DeliveryOrder
@@ -366,6 +94,7 @@
                    BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
                    #endregion
                    #region å¤„理库存、库存批次、添加出库任务
                    List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                    foreach (var item in entityOrder.Details)
                    {
                        Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num);
@@ -373,7 +102,7 @@
                        if (inventory_Batch.AvailableQuantity < item.Order_qty) throw new Exception($"出库单号【{entityOrder.Out_no}】中物料编号【{item.Goods_no}】物料批次【{item.Batch_num}】的库存批次信息可用数量不足");
                        inventory_Batch.AvailableQuantity -= item.Order_qty;
                        inventory_Batch.OutboundQuantity += item.Order_qty;
                        List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == item.Reservoirarea);
                        List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == item.Reservoirarea);
                        #region æŒ‰å‡ºåº“策略查找库存
                        if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
                            dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
@@ -384,52 +113,66 @@
                        foreach (var InventoryInfo in dt_InventoryInfos)
                        {
                            if (Order_qty <= 0) break;
                            if (InventoryInfo.AvailableQuantity < Order_qty)
                            if (InventoryInfo.AvailableQuantity <= Order_qty)
                            {
                                InventoryInfo.AvailableQuantity = 0;
                                Order_qty -= InventoryInfo.AvailableQuantity;
                                InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
                                InventoryInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                {
                                    WarehouseCode = InventoryInfo.WarehouseCode,
                                    BatchNo = InventoryInfo.BatchNo,
                                    MaterielName = InventoryInfo.MaterielName,
                                    MaterielCode = InventoryInfo.MaterielCode,
                                    MaterielSpec = InventoryInfo.MaterielSpec,
                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                    CreateDate = DateTime.Now,
                                    Creater = App.User.UserName ?? "System",
                                    LocationCode = InventoryInfo.LocationCode,
                                    OrderNo = entityOrder.Out_no,
                                    StockQuantity = InventoryInfo.AvailableQuantity,
                                    SupplyQuantity = 0,
                                    Remark = "出库"
                                };
                                supplyTasks.Add(supplyTask);
                                InventoryInfo.AvailableQuantity = 0;
                            }
                            else
                            {
                                InventoryInfo.AvailableQuantity -= Order_qty;
                                Order_qty = 0;
                                InventoryInfo.OutboundQuantity += Order_qty;
                                InventoryInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                {
                                    WarehouseCode = InventoryInfo.WarehouseCode,
                                    BatchNo = InventoryInfo.BatchNo,
                                    MaterielName = InventoryInfo.MaterielName,
                                    MaterielCode = InventoryInfo.MaterielCode,
                                    MaterielSpec = InventoryInfo.MaterielSpec,
                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                    CreateDate = DateTime.Now,
                                    Creater = App.User.UserName ?? "System",
                                    LocationCode = InventoryInfo.LocationCode,
                                    OrderNo = entityOrder.Out_no,
                                    StockQuantity = Order_qty,
                                    SupplyQuantity = 0,
                                    Remark = "出库"
                                };
                                supplyTasks.Add(supplyTask);
                                Order_qty = 0;
                            }
                        }
                        dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.出库锁定.ObjToInt()).ToList();
                        List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                        foreach (var inventoryInfo in dt_InventoryInfos)
                        {
                            Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                            {
                                WarehouseCode = inventoryInfo.WarehouseCode,
                                BatchNo = inventoryInfo.BatchNo,
                                MaterielName = inventoryInfo.MaterielName,
                                MaterielCode = inventoryInfo.MaterielCode,
                                MaterielSpec = inventoryInfo.MaterielSpec,
                                TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                CreateDate = DateTime.Now,
                                Creater = App.User.UserName ?? "System",
                                LocationCode = inventoryInfo.LocationCode,
                                OrderNo = entityOrder.Out_no,
                                StockQuantity = inventoryInfo.OutboundQuantity,
                                SupplyQuantity = 0,
                                Remark = "出库"
                            };
                            supplyTasks.Add(supplyTask);
                        }
                        _inventory_BatchServices.Repository.UpdateData(inventory_Batch);
                        _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
                        _supplyTaskService.AddData(supplyTasks);
                    }
                    _supplyTaskService.AddData(supplyTasks);
                    #endregion
                }
                #endregion
                else
                {
                    string WareCodeDJ = WarehouseEnum.大件库.ObjToInt().ToString("000");
                    string WareCodeLK = WarehouseEnum.立库.ObjToInt().ToString("000");
                    #region åˆ›å»ºå¤§ä»¶åº“、立库出库头表
                    var entityOrder = new Dt_DeliveryOrder
                    {
@@ -439,7 +182,7 @@
                        Client_name = outorder.client_name,
                        Account_time = outorder.account_time,
                        Client_no = outorder.client_no,
                        Warehouse_no = WarehouseEnum.大件库.ObjToInt().ToString("000"),
                        Warehouse_no = WareCodeDJ,
                        Details = new List<Dt_DeliveryOrderDetail>()
                    };
                    var entityOrderLK = new Dt_DeliveryOrder
@@ -450,7 +193,7 @@
                        Client_name = outorder.client_name,
                        Account_time = outorder.account_time,
                        Client_no = outorder.client_no,
                        Warehouse_no = WarehouseEnum.立库.ObjToInt().ToString("000"),
                        Warehouse_no = WareCodeLK,
                        Details = new List<Dt_DeliveryOrderDetail>()
                    };
                    #endregion
@@ -463,7 +206,7 @@
                        if (inventory_Batch.AvailableQuantity < detail.order_qty) throw new Exception($"出库单号【{outorder.order_no}】中物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】的库存批次信息可用数量不足");
                        inventory_Batch.AvailableQuantity -= detail.order_qty;
                        inventory_Batch.OutboundQuantity += detail.order_qty;
                        List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.StockQuantity > x.OutboundQuantity && (x.WarehouseCode == WarehouseEnum.大件库.ObjToInt().ToString("000") || x.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000")));
                        List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo && x.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));
                        #endregion
                        #region æŒ‰å‡ºåº“策略查找库存
                        if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
@@ -497,50 +240,59 @@
                            entityOrder.Details.Add(orderDetail);
                            #endregion

                            #region è®¡ç®—库存
                            List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                            #region è®¡ç®—库存、添加出库任务
                            foreach (var InventoryInfo in dt_InventoryInfos)
                            {
                                if (Order_qty <= 0) break;
                                if (InventoryInfo.AvailableQuantity < Order_qty)
                                {
                                    InventoryInfo.AvailableQuantity = 0;
                                    Order_qty -= InventoryInfo.AvailableQuantity;
                                    InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
                                    InventoryInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                    {
                                        WarehouseCode = InventoryInfo.WarehouseCode,
                                        BatchNo = InventoryInfo.BatchNo,
                                        MaterielName = InventoryInfo.MaterielName,
                                        MaterielCode = InventoryInfo.MaterielCode,
                                        MaterielSpec = InventoryInfo.MaterielSpec,
                                        TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                        TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                        CreateDate = DateTime.Now,
                                        Creater = App.User.UserName ?? "System",
                                        LocationCode = InventoryInfo.LocationCode,
                                        OrderNo = entityOrder.Out_no,
                                        StockQuantity = InventoryInfo.AvailableQuantity,
                                        SupplyQuantity = 0,
                                        Remark = "出库"
                                    };
                                    supplyTasks.Add(supplyTask);
                                    InventoryInfo.AvailableQuantity = 0;
                                }
                                else
                                {
                                    InventoryInfo.AvailableQuantity -= Order_qty;
                                    Order_qty = 0;
                                    InventoryInfo.OutboundQuantity += Order_qty;
                                    InventoryInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                    {
                                        WarehouseCode = InventoryInfo.WarehouseCode,
                                        BatchNo = InventoryInfo.BatchNo,
                                        MaterielName = InventoryInfo.MaterielName,
                                        MaterielCode = InventoryInfo.MaterielCode,
                                        MaterielSpec = InventoryInfo.MaterielSpec,
                                        TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                        TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                        CreateDate = DateTime.Now,
                                        Creater = App.User.UserName ?? "System",
                                        LocationCode = InventoryInfo.LocationCode,
                                        OrderNo = entityOrder.Out_no,
                                        StockQuantity = Order_qty,
                                        SupplyQuantity = 0,
                                        Remark = "出库"
                                    };
                                    supplyTasks.Add(supplyTask);
                                    Order_qty = 0;
                                }
                            }
                            #endregion

                            #region ç”Ÿæˆå‡ºåº“任务
                            dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.出库锁定.ObjToInt()).ToList();
                            List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                            foreach (var inventoryInfo in dt_InventoryInfos)
                            {
                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                {
                                    WarehouseCode = inventoryInfo.WarehouseCode,
                                    BatchNo = inventoryInfo.BatchNo,
                                    MaterielName = inventoryInfo.MaterielName,
                                    MaterielCode = inventoryInfo.MaterielCode,
                                    MaterielSpec = inventoryInfo.MaterielSpec,
                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                    CreateDate = DateTime.Now,
                                    Creater = App.User.UserName ?? "System",
                                    LocationCode = inventoryInfo.LocationCode,
                                    OrderNo = entityOrder.Out_no,
                                    StockQuantity = inventoryInfo.OutboundQuantity,
                                    SupplyQuantity = 0,
                                    Remark = "出库"
                                };
                                supplyTasks.Add(supplyTask);
                            }
                            #endregion
                            _inventory_BatchServices.Repository.UpdateData(inventory_Batch);
@@ -550,6 +302,7 @@
                        #endregion
                        else
                        {
                            List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                            Dt_DeliveryOrderDetail orderDetail = null;
                            Dt_DeliveryOrderDetail orderDetailLK = null;
                            var ys = Order_qty % materielInfo.BoxQty; //不能整除箱规的散件数 
@@ -571,11 +324,11 @@
                            }
                            #endregion

                            #region æ•´ä»¶ä¼˜å…ˆåˆ†é…å¤§ä»¶åº“
                            foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WarehouseEnum.大件库.ObjToInt().ToString("000")))
                            #region æ•´ä»¶ä¼˜å…ˆåˆ†é…å¤§ä»¶åº“,计划库存,添加出库任务
                            foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ))
                            {
                                if (xs <= 0) break;
                                item.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                                decimal outqty = 0;
                                while (item.AvailableQuantity > 0 && xs > 0)
                                {
                                    xs--;
@@ -590,50 +343,73 @@
                                            Exp_date = detail.exp_date,
                                            OotDetailStatus = "新建",
                                            Order_Outqty = 0,
                                            Status = 0
                                            Status = 2
                                        };
                                        item.AvailableQuantity -= materielInfo.BoxQty;
                                        item.OutboundQuantity += materielInfo.BoxQty;
                                        outqty += materielInfo.BoxQty;
                                    }
                                    else
                                    {
                                        orderDetail.Order_qty += materielInfo.BoxQty;
                                        item.AvailableQuantity -= materielInfo.BoxQty;
                                        item.OutboundQuantity += materielInfo.BoxQty;
                                        outqty += materielInfo.BoxQty;
                                    }
                                }
                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                {
                                    WarehouseCode = item.WarehouseCode,
                                    BatchNo = item.BatchNo,
                                    MaterielName = item.MaterielName,
                                    MaterielCode = item.MaterielCode,
                                    MaterielSpec = item.MaterielSpec,
                                    TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                    CreateDate = DateTime.Now,
                                    Creater = App.User.UserName ?? "System",
                                    LocationCode = item.LocationCode,
                                    OrderNo = entityOrder.Out_no,
                                    StockQuantity = outqty,
                                    SupplyQuantity = 0,
                                    Remark = "出库"
                                };
                                supplyTasks.Add(supplyTask);
                                _inventoryInfoService.Repository.UpdateData(item);
                            }
                            #endregion

                            #region åˆ†é…å®Œå¤§ä»¶åº“如果还有箱数，再选择分配立库
                            if (orderDetailLK == null)
                            if (xs > 0)
                            {
                                orderDetailLK = new Dt_DeliveryOrderDetail()
                                if (orderDetailLK == null)
                                {
                                    Reservoirarea = entityOrderLK.Warehouse_no,
                                    Goods_no = detail.goods_no,
                                    Order_qty = xs * materielInfo.BoxQty,
                                    Batch_num = detail.batch_num,
                                    Exp_date = detail.exp_date,
                                    OotDetailStatus = "新建",
                                    Order_Outqty = 0,
                                    Status = 0
                                };
                            }
                            else
                            {
                                orderDetailLK.Order_qty += xs * materielInfo.BoxQty;
                                    orderDetailLK = new Dt_DeliveryOrderDetail()
                                    {
                                        Reservoirarea = entityOrderLK.Warehouse_no,
                                        Goods_no = detail.goods_no,
                                        Order_qty = xs * materielInfo.BoxQty,
                                        Batch_num = detail.batch_num,
                                        Exp_date = detail.exp_date,
                                        OotDetailStatus = "新建",
                                        Order_Outqty = 0,
                                        Status = 0
                                    };
                                }
                                else
                                {
                                    orderDetailLK.Order_qty += xs * materielInfo.BoxQty;
                                }
                            }
                            #endregion
                            List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();

                            #region ç«‹åº“出库单，修改立库库存，添加立库出库任务
                            if (orderDetailLK != null)
                            {
                                #region æ·»åŠ å‡ºåº“任务、修改库存信息
                                Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000")).First();
                                Dt_InventoryInfo inventoryInfo = dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
                                inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;
                                inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;
                                inventoryInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                                _inventoryInfoService.Repository.UpdateData(inventoryInfo);
                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                {
                                    WarehouseCode = inventoryInfo.WarehouseCode,
@@ -647,44 +423,18 @@
                                    Creater = App.User.UserName ?? "System",
                                    LocationCode = inventoryInfo.LocationCode,
                                    OrderNo = entityOrder.Out_no,
                                    StockQuantity = inventoryInfo.OutboundQuantity,
                                    StockQuantity = orderDetailLK.Order_qty,
                                    SupplyQuantity = 0,
                                    Remark = "出库"
                                };
                                supplyTasks.Add(supplyTask);
                                #endregion
                                _inventoryInfoService.Repository.UpdateData(inventoryInfo);
                                entityOrderLK.Details.Add(orderDetailLK);
                            }
                            if (orderDetail != null)
                            {
                                #region æ·»åŠ å‡ºåº“任务、修改库存信息
                                dt_InventoryInfos = dt_InventoryInfos.Where(X => X.StockStatus == StockStatusEmun.出库锁定.ObjToInt()).ToList();
                                foreach (var inventoryInfo in dt_InventoryInfos)
                                {
                                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                                    {
                                        WarehouseCode = inventoryInfo.WarehouseCode,
                                        BatchNo = inventoryInfo.BatchNo,
                                        MaterielName = inventoryInfo.MaterielName,
                                        MaterielCode = inventoryInfo.MaterielCode,
                                        MaterielSpec = inventoryInfo.MaterielSpec,
                                        TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
                                        TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                                        CreateDate = DateTime.Now,
                                        Creater = App.User.UserName ?? "System",
                                        LocationCode = inventoryInfo.LocationCode,
                                        OrderNo = entityOrder.Out_no,
                                        StockQuantity = inventoryInfo.OutboundQuantity,
                                        SupplyQuantity = 0,
                                        Remark = "出库"
                                    };
                                    supplyTasks.Add(supplyTask);
                                }
                                #endregion
                                entityOrder.Details.Add(orderDetail);
                            }
                            #endregion
                            if (orderDetail != null) entityOrder.Details.Add(orderDetail);
                            _inventory_BatchServices.Repository.UpdateData(inventory_Batch);
                            _inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
                            _supplyTaskService.AddData(supplyTasks);
                        }
                    }
@@ -808,116 +558,6 @@
        }


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

                // 2. å†è¿‡æ»¤æŽ‰ä¸ç¬¦åˆæ¡ä»¶çš„明细（只保留 Status=0 ï¼‰
                foreach (var order in outOrders)
                {
                    order.Details = order.Details.Where(d => d.Status == 0).ToList();
                }

                if (outOrders == null || !outOrders.Any())
                {
                    Console.WriteLine("没有符合条件的订单需要推送");
                    return responseContent.Error("没有符合条件的订单需要推送");
                }

                foreach (var order in outOrders)
                {
                    try
                    {
                        string materialCode = "YY";//默认值
                                                   //获取当前订单的第一个明细项
                        var firstDetail = order.Details.FirstOrDefault();
                        if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
                        {
                            //如果条件满足，将物料代码设置为第一个明细项对应的药品物料代码
                            materialCode = firstDetail.MedicineGoods.MaterielErpType;
                        }
                        // 3. ç»„装 DTO
                        var ediDto = new TowcsDto.ToediOutInfo
                        {
                            customerCode = "905",
                            materialCode = materialCode,
                            externalOrderNo = order.Out_no,
                            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
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = d.MedicineGoods?.MaterielName,
                                productSpecifications = d.MedicineGoods?.MaterielModel,
                                quantity = (int)d.Order_qty,
                                //stocktakingDetails = order.Out_type == "3"
                                //    ? new List<ToOutediInStock>
                                //      {
                                //  new ToOutediInStock { palletCode = "FC00001", quantity = d.Order_qty.ToString() }
                                //      }
                                //    : null
                            }).ToList()
                        };

                        // 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);

                        if (resp != null && resp.code == "0")
                        {
                            // æ›´æ–°è¡¨å¤´çŠ¶æ€
                            BaseDal.Db.Updateable<Dt_DeliveryOrder>()
                              .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "开始" })
                              .Where(o => o.Id == order.Id)
                              .ExecuteCommand();

                            // æ›´æ–°æ˜Žç»†çŠ¶æ€
                            BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
                              .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "开始" })
                              .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
                              .ExecuteCommand();
                            Console.WriteLine($"订单 {order.Out_no} æŽ¨é€æˆåŠŸ");
                        }
                        else
                        {
                            SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
                            Console.WriteLine($"订单 {order.Out_no} æŽ¨é€å¤±è´¥ï¼š{resp?.msg}");
                        }
                        //删除全部状为已完成的明细和表头，移入历史表
                    }
                    catch (Exception ex)
                    {
                        SendErrorToUpstream(3, order.Out_no, ex.Message, "");
                        Console.WriteLine($"订单 {order.Out_no} æŽ¨é€å¼‚常：{ex.Message}");
                    }
                }

                return responseContent.OK("出库订单推送完成");
            }
            catch (Exception ex)
            {
                Console.WriteLine("EdiOut å¼‚常：" + ex.Message);
                return responseContent.Error("出库订单推送失败：" + ex.Message);
            }
        }


        //盘点 æ‹¿æ•´ä¸ªæ‰¹æ¬¡ä¿¡æ¯è¡¨çš„商品批号和商品编号来进行盘点
        public WebResponseContent InventoryGood(string batchNo, string goodsNo)
        {
@@ -979,88 +619,6 @@
            catch (Exception ex)
            {
                return response.Error("盘点失败：" + ex.Message);
            }
        }




        /// <summary>
        /// å‡ºåº“报完成接口
        /// </summary>
        /// <param name="out_no">出库单号</param>
        /// <returns></returns>
        public WebResponseContent CompleteAllOutOrders()
        {
            var responseContent = new WebResponseContent();
            try
            {
                #region æŸ¥æ‰¾æ‰€æœ‰å·²å®Œæˆå‡ºåº“单
                var outorders = BaseDal.QueryData(x => x.OutStatus == "已完成").Select(x => x.Out_no).Distinct().ToList();
                foreach (var outorder in outorders)
                {
                    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())
                    {
                        BaseDal.Db.Ado.BeginTran();
                        BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        foreach (var item in Orders)
                        {
                            _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
                        {
                            BaseDal.Db.Ado.RollbackTran();
                            SendErrorToUpstream(4, "", $"上游接口返回失败: {response.resultMsg}", outorder);
                        }
                    }
                }
                #endregion

                return responseContent.OK();
            }
            catch (Exception ex)
            {
                BaseDal.Db.Ado.RollbackTran();
                return responseContent.Error("批量处理失败：" + ex.Message);
            }
        }




        /// <summary>
        /// æŽ¨é€å¼‚常信息给上游系统 1.入库单接口；2.入库单报完成接口；3.出库单接口；4.出库报完成接口；5.药品基础信息同步接口；6.供应商信息接口；7.客户信息接口；8.库存查询接口
        /// </summary>
        public void SendErrorToUpstream(int type, string code, string message, string remark)
        {
            try
            {
                var url = "http://121.37.118.63:80/GYZ2/95fck/exceptionLog";

                var requestData = new
                {
                    type = type.ToString(),
                    code = code,
                    message = message,
                    remark = remark
                };

                var result = HttpHelper.Post(url, requestData.ToJsonString());
                // å¯ä»¥ååºåˆ—化检查 resultCode æ˜¯å¦ä¸º0
            }
            catch (Exception e)
            {
                // è¿™é‡Œä¸è¦å†æŠ›å¼‚常了，避免死循环
                Console.WriteLine("异常接口推送失败：" + e.Message);
            }
        }

@@ -1220,7 +778,12 @@
                }
                #endregion
                if (supplyTask.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000"))
                    CreateAllocatInOut(materielInfo);//创建调拨任务
                {
                    materielInfo.Business_qty -= supplyTask.StockQuantity;
                    _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
                    if (materielInfo.Business_qty < materielInfo.MinQty)
                        CreateAllocatInOut(materielInfo);//创建调拨任务
                }
                _unitOfWorkManage.CommitTran();
                #endregion
                content.OK();