Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

yanjinhui

2025-10-24 f58ce4647a1c246eb441d547cd12b9b9f417a7c1

Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

 н¨Îļþ¼Ð/PDA/pages/stash/raworderboxing.vue

@@ -137,6 +137,7 @@
                matInfos: [],
                orderNo: "",
                batchNo: "",
                materielCode:"",
                orderqty: 0,
                Inqty: 0,
                goods_no: "",
@@ -178,6 +179,7 @@
            this.Inqty = res.order_Inqty;
            this.orderqty = res.order_qty;
            this.batchNo = res.batchNo;
            this.materielCode=res.goods_no;
            this.warehouseId = res.warehouseId;
            this.label = "单据编号：" + this.orderNo;
            this.batch_num = "批次号：" + res.batchNo;
@@ -460,6 +462,7 @@
                        "LocationCode": this.barcode,
                        "warehouseCode": this.warehouseId,
                        "orderNo": this.orderNo,
                        "materielCode":this.materielCode,
                        "Inqty": this.materSn,
                        "batchNo": this.batchNo,
                    },

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs

@@ -82,5 +82,6 @@
        /// <returns></returns>
        WebResponseContent CheckFinish(SaveModel saveModel);
        WebResponseContent GetCheckOutTasks(SaveModel saveModel);
        WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask);
    }
}

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs

@@ -21,10 +21,16 @@
        public int Id { get; set; }

        /// <summary>
        /// åº“房id
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "库房id")]
        public int WarehouseId { get; set; }

        /// <summary>
        /// åº“房编号
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "库房编号")]
        public int WarehouseId { get; set; }
        [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "库房编号")]
        public string WarehouseCode { get; set; }

        /// <summary>
        /// è´§ä½ç¼–号

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

@@ -120,12 +120,13 @@
                var LocationCode = saveModel.MainData["LocationCode"].ToString();
                var orderNo = saveModel.MainData["orderNo"].ToString();
                var batchNo = saveModel.MainData["batchNo"].ToString();
                var materielCode = saveModel.MainData["materielCode"].ToString();
                var Inqty = saveModel.MainData["Inqty"].ObjToInt();
                var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
                Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == orderNo && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
                if (cabinOrder == null || cabinOrder.OdrderStatus == "已完成")
                    return WebResponseContent.Instance.Error($"入库单已完成");
                Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Status == 2).First();
                Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).First();
                if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "已完成")
                    return WebResponseContent.Instance.Error($"入库单明细已完成");
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
@@ -143,28 +144,9 @@
                if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
                {
                    cabinOrderDetail.OrderDetailStatus = "已完成";
                    //_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.自动完成);

                    //Dt_CabinOrderDetail_Hty hty = new Dt_CabinOrderDetail_Hty
                    //{
                    //    Id = cabinOrderDetail.OrderId,
                    //    Reservoirarea = cabinOrderDetail.Reservoirarea,
                    //    Goods_no = cabinOrderDetail.Goods_no,
                    //    Order_qty = cabinOrderDetail.Order_qty,
                    //    Order_Inqty = cabinOrderDetail.Order_Inqty,
                    //    Batch_num = cabinOrderDetail.Batch_num,
                    //    Exp_date = cabinOrderDetail.Exp_date,
                    //    OrderDetailStatus = cabinOrderDetail.OrderDetailStatus,
                    //    Status = cabinOrderDetail.Status,
                    //    Creater = cabinOrderDetail.Creater,
                    //    CreateDate = cabinOrderDetail.CreateDate,
                    //    Modifier = App.User.UserName,
                    //    ModifyDate = DateTime.Now
                    //};
                    //var i = BaseDal.Db.Insertable(hty).ExecuteCommand();
                }
                _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
                var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).First();
                var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
                if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "已完成").Any()) cabinOrder.OdrderStatus = "已完成";
                Repository.UpdateData(cabinOrder);
                #endregion
@@ -174,6 +156,8 @@
                if (location == null) return WebResponseContent.Instance.Error($"请维护货位编号【{LocationCode}】的货位信息");
                if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】已禁用，请恢复正常再使用");
                if (location.WarehouseCode != cabinOrderDetail.Reservoirarea)
                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】所属库房与当前入库单所属库房不匹配");
                if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
                {
                    location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
@@ -187,6 +171,7 @@
                {
                    inventoryInfo.StockQuantity += Inqty;
                    inventoryInfo.AvailableQuantity += Inqty;
                    inventoryInfo.InDate = DateTime.Now;
                    _inventoryInfoService.UpdateData(inventoryInfo);
                }
                else
@@ -586,7 +571,7 @@
                //查出包含全部的入库单，包含全部明细+一个明细对应一个商品
                var orders = BaseDal.Db.CopyNew()
                .Queryable<Dt_CabinOrder>()
                .Where(o => o.OdrderStatus == "新建")
                .Where(o => o.OdrderStatus == "新建" && o.Warehouse_no == WarehouseEnum.立库.ObjToInt().ToString("000"))
                .Includes(o => o.Details, d => d.MedicineGoods)
                .ToList();
                // 3. å†è¿‡æ»¤æŽ‰ä¸ç¬¦åˆæ¡ä»¶çš„明细（只保留 Status=0）
@@ -698,7 +683,7 @@
            try
            {
                #region æŸ¥æ‰¾æ‰€æœ‰å·²å®Œæˆå…¥åº“单
                var inorders = BaseDal.QueryData(x => x.OdrderStatus == "已完成").Select(x => x.Order_no).ToList();
                var inorders = BaseDal.QueryData(x => x.OdrderStatus == "已完成").Select(x => x.Order_no).Distinct().ToList();
                foreach (var inorder in inorders)
                {
                    //var Orders = BaseDal.QueryData(x => x.Order_no == inorder);

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

@@ -3,6 +3,8 @@
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;
@@ -12,6 +14,7 @@
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -49,299 +52,6 @@
            _inventoryInfoService = inventoryInfoService;
            _cabinOrderServices = cabinOrderServices;
        }

        /// <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";
        //        //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") // æ­£å¸¸å‡ºåº“单
        //                {
        //                    // æŽ’除特殊药品,特殊药品直接插入
        //                    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;
        //                                }
        //                                else
        //                                {
        //                                    // ç«‹åº“库存不足，散件也从平库出
        //                                    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 = 2 // å¹³åº“
        //                                    };
        //                                }
        //                                #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();
        //            }

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


        public WebResponseContent GetUpstreamOutOrder()
        {
            var responseContent = new WebResponseContent();
@@ -408,6 +118,7 @@
                        }
                        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"))
                            {
@@ -615,8 +326,60 @@
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
        /// <summary>
        /// åˆ›å»ºå‡ºåº“单
        /// </summary>
        /// <param name="outorder"></param>
        /// <returns></returns>
        public WebResponseContent CreateOutboundOrder(UpstramOutOrderInfo outorder)
        {
            WebResponseContent webResponseContent = new WebResponseContent();
            try
            {
                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
                        {
                            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

                    #region å¤„理库存

                    #endregion

                    #region æ·»åŠ å‡ºåº“任务

                    #endregion
                }
                else
                {

                }
            }
            catch (Exception ex)
            {
                webResponseContent.Error(ex.Message);
            }
            return webResponseContent;
        }
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“单任务
        /// </summary>
@@ -735,7 +498,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();

@@ -911,129 +674,41 @@
            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);
            }
        }
@@ -1119,7 +794,7 @@
                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.Status == 2).ToList();
            content.OK(data: cabinOrderDetails); 
            content.OK(data: cabinOrderDetails);
            return content;
        }

@@ -1133,7 +808,20 @@
                Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());
                if (supplyTask == null) throw new Exception("当前出库任务已完成");
                if (supplyTask.LocationCode != LocationCode) throw new Exception($"当前出库货位【{LocationCode}】与任务分配货位不匹配");
                supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
                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($"出库单已完成");
@@ -1147,7 +835,7 @@
                    return WebResponseContent.Instance.Error($"出库数量不可超出单据数量");


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

                #region å‡ºåº“单
@@ -1156,21 +844,20 @@
                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 = "已完成";
                _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}】的库存信息");
                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
@@ -1178,39 +865,47 @@
                #endregion

                #region è´§ä½
                var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
                if (location == null) return WebResponseContent.Instance.Error($"请维护货位编号【{LocationCode}】的货位信息");
                if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】已禁用，请恢复正常再使用");
                Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
                if (inventoryInfo1 == null)
                if (supplyTask.WarehouseCode != WarehouseEnum.立库.ObjToInt().ToString("000"))
                {
                    location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                    _basicService.LocationInfoService.UpdateData(location);
                    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);
                //_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.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();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;

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

@@ -1,16 +1,22 @@
using HslCommunication;
using MailKit.Search;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.SquareCabin;
using WIDESEA_ISquareCabinServices;
using WIDESEA_IWMsInfoServices;
using WIDESEA_Model.Models;
using static WIDESEA_DTO.SquareCabin.OrderDto;
using static WIDESEA_DTO.SquareCabin.TowcsDto;
@@ -81,8 +87,6 @@





        /// <summary>
        /// wcs回传给我调用我的方法 ä¸ç®¡æ˜¯å…¥åº“ å‡ºåº“ ç›˜ç‚¹éƒ½ä¼šè°ƒç”¨è¿™ä¸ªæŽ¥å£
        /// </summary>
@@ -91,111 +95,159 @@
        public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
        {
            try
            {  
            {
                // 1️⃣ æ ¡éªŒè¯·æ±‚
                if (request == null || request.details == null || !request.details.Any())
                {
                    return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "请求参数无效" };
                }

                //查找到全部的

                // 2️⃣ å¼€å¯äº‹åŠ¡
                BaseDal.Db.Ado.BeginTran();
                foreach (var detail in request.details)
                {
                    #region æŸ¥è¯¢ç‰©æ–™ä¿¡æ¯ã€è®¡ç®—总和
                    //查询物料表
                    var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();

                    if (goods == null) throw new Exception($"未找到物料编码【{detail.productCode}】的物料信息");
                    // 3️ è®¡ç®—入库数量（取正）遍历 orderDetails ä¸­çš„每个 EdiOrderBoxDto å¯¹è±¡
                    decimal orderQty = detail.orderDetails?
                        .Sum(x => decimal.TryParse(x.quantity, out var q) ? Math.Abs(q) : 0)
                        ?? 0;

                    // 5️⃣ æŸ¥è¯¢åº“存详情
                    var entity = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                        .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.LocationCode == "立库");
                    //查询物料表
                    var Goods = BaseDal.Db.Queryable<Dt_MaterielInfo>().First(x => x.MaterielCode == detail.productCode);

                    if (entity == null)
                    {
                        entity = new Dt_InventoryInfo
                        {
                            PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
                            WarehouseCode = "001",
                            LocationCode = "立库",
                            StockStatus = 1,
                            MaterielCode = detail.productCode ?? detail.productName,
                            MaterielName = detail.productName ?? "",
                            MaterielSpec = detail.productSpecifications ?? "",
                            BatchNo = detail.batchNo,
                            StockQuantity = 0,
                            OutboundQuantity = 0,
                            SupplyQuantity = 0,
                            AvailableQuantity = 0,
                            InDate = DateTime.Now,
                            ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                            ShelfLife = 0,
                            ValidityPeriod = "",
                            Remark = "WCS回传创建"
                        };
                    }

                    // 6️⃣ æŸ¥è¯¢åº“存批次信息
                    var batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                        .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo);

                    if (batch == null)
                    {
                        batch = new Dt_Inventory_Batch
                        {
                            MaterielCode = detail.productCode ?? detail.productName,
                            MaterielName = detail.productName ?? "",
                            MaterielSpec = detail.productSpecifications ?? "",
                            BatchNo = detail.batchNo,
                            StockQuantity = 0,
                            OutboundQuantity = 0,
                            AvailableQuantity = 0,
                            SupplyQuantity = 0,
                            ERPStockQuantity = 0,
                            Status = false,
                            ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                            ValidityPeriod = DateTime.Now.AddYears(1).ToString("yyyy-MM-dd"),
                            Remark = "自动创建"
                        };
                    }
                    #endregion

                    // 7️⃣ æŒ‰è®¢å•ç±»åž‹æ‰§è¡Œä¸åŒé€»è¾‘
                    switch (request.orderType)
                    {
                        case "1": //入库
                            entity.StockQuantity = orderQty; //实际库存
                            entity.AvailableQuantity = orderQty;
                            entity.InDate = DateTime.Now;
                            entity.Remark = "入库单回传";
                            {
                                #region å¤„理入库订单
                                Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no == WarehouseEnum.立库.ObjToInt().ToString("000")).Includes(x => x.Details).First();
                                if (cabinOrder == null || cabinOrder.OdrderStatus == "已完成")
                                    throw new Exception($"入库单已完成");
                                Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == detail.productCode && x.Batch_num == detail.batchNo && x.Status == 1).First();
                                if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "已完成")
                                    throw new Exception($"入库单明细已完成");
                                cabinOrderDetail.Order_Inqty += orderQty;
                                if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
                                    throw new Exception($"入库数量不可超出单据数量");
                                cabinOrder.OdrderStatus = "开始";
                                cabinOrderDetail.OrderDetailStatus = "开始";
                                if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
                                    cabinOrderDetail.OrderDetailStatus = "已完成";
                                BaseDal.Db.Updateable(cabinOrderDetail).ExecuteCommand();
                                var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no && x.Warehouse_no == WarehouseEnum.立库.ObjToInt().ToString("000")).Includes(x => x.Details).First();
                                if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "已完成").Any())
                                    cabinOrder.OdrderStatus = "已完成";
                                BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
                                #endregion

                                #region åˆ›å»ºåº“存信息
                                // 5️⃣ æŸ¥è¯¢åº“存详情
                                var inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                                    .First(x => x.MaterielCode == cabinOrderDetail.Goods_no && x.BatchNo == cabinOrderDetail.Batch_num && x.LocationCode == "立库");
                                if (inventoryInfo != null)
                                {
                                    inventoryInfo.StockQuantity += orderQty;
                                    inventoryInfo.AvailableQuantity += orderQty;
                                    inventoryInfo.InDate = DateTime.Now;
                                    BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
                                }
                                else
                                {
                                    inventoryInfo = new Dt_InventoryInfo
                                    {
                                        PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
                                        WarehouseCode = "001",
                                        LocationCode = "立库",
                                        StockStatus = StockStatusEmun.入库完成.ObjToInt(),
                                        MaterielCode = goods.MaterielCode,
                                        MaterielName = goods.MaterielName,
                                        MaterielSpec = goods.MaterielSpec,
                                        BatchNo = detail.batchNo,
                                        StockQuantity = orderQty,
                                        OutboundQuantity = 0,
                                        SupplyQuantity = 0,
                                        AvailableQuantity = orderQty,
                                        InDate = DateTime.Now,
                                        ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                                        ShelfLife = 0,
                                        ValidityPeriod = cabinOrderDetail.Exp_date,
                                        Remark = "WCS回传创建"
                                    };
                                    BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
                                }
                                #endregion

                            batch.StockQuantity = orderQty;
                            batch.AvailableQuantity = orderQty;
                            batch.Remark = "入库单回传";
                            UpdateInboundOrderDetailStatus(detail.batchNo, detail.productCode);
                            break;
                                #region åˆ›å»ºåº“存批次信息
                                // 6️⃣ æŸ¥è¯¢åº“存批次信息
                                var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                                    .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);

                        case "2": // å‡ºåº“  æ€»100  å‡º20
                            decimal actualOutQty = entity.StockQuantity - orderQty;// è®¡ç®—本次实际出库数量 20
                            entity.StockQuantity=orderQty; //实际库存数 100
                            entity.OutboundQuantity =Math.Max(0,entity.OutboundQuantity-actualOutQty); //待出库数量
                            entity.AvailableQuantity = entity.StockQuantity - entity.OutboundQuantity;//可用库存
                            if (entity.StockQuantity < 0) entity.StockQuantity = 0;
                            entity.Remark = "出库单回传";
                                if (inventory_Batch != null)
                                {
                                    inventory_Batch.StockQuantity += orderQty;
                                    inventory_Batch.AvailableQuantity += orderQty;
                                    BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
                                }
                                else
                                {
                                    inventory_Batch = new Dt_Inventory_Batch
                                    {
                                        MaterielCode = inventoryInfo.MaterielCode,
                                        MaterielName = inventoryInfo.MaterielName,
                                        MaterielSpec = inventoryInfo.MaterielSpec,
                                        BatchNo = inventoryInfo.BatchNo,
                                        StockQuantity = inventoryInfo.StockQuantity,
                                        OutboundQuantity = inventoryInfo.OutboundQuantity,
                                        AvailableQuantity = inventoryInfo.AvailableQuantity,
                                        SupplyQuantity = inventoryInfo.SupplyQuantity,
                                        ERPStockQuantity = 0,
                                        Status = false,
                                        ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                                        ValidityPeriod = inventoryInfo.ValidityPeriod,
                                        Remark = "自动创建"
                                    };
                                    BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
                                }
                                #endregion

                                #region æ·»åŠ å…¥åº“任务历史
                                Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
                                {
                                    WarehouseCode = inventoryInfo.WarehouseCode,
                                    TaskNum = cabinOrderDetail.Id,
                                    OperateType = OperateTypeEnum.自动完成.ToString(),
                                    InsertTime = DateTime.Now,
                                    TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
                                    BatchNo = inventoryInfo.BatchNo,
                                    MaterielName = inventoryInfo.MaterielName,
                                    MaterielCode = inventoryInfo.MaterielCode,
                                    MaterielSpec = inventoryInfo.MaterielSpec,
                                    TaskType = TaskTypeEnum.InPick.ObjToInt(),
                                    CreateDate = DateTime.Now,
                                    Creater = App.User.UserName,
                                    LocationCode = inventoryInfo.LocationCode,
                                    OrderNo = cabinOrder.Order_no,
                                    StockQuantity = orderQty,
                                    SupplyQuantity = 0,
                                    Remark = "入库"
                                };
                                BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
                                #endregion

                            batch.StockQuantity = orderQty;
                            batch.OutboundQuantity =Math.Max(0,batch.OutboundQuantity-actualOutQty);//待出库数量
                            batch.AvailableQuantity = batch.StockQuantity - batch.OutboundQuantity; //可用库存
                            if (batch.StockQuantity < 0) batch.StockQuantity = 0;
                            batch.Remark = "出库单回传";
                            UpdateOutboundOrderDetailStatus(detail.batchNo, detail.productCode);
                            //调拨任务
                            _deliveryOrderServices.CreateAllocatInOut(goods);
                                //UpdateInboundOrderDetailStatus(request.orderNo, detail.batchNo, detail.productCode);
                                break;
                            }
                        case "2":
                            #region æ‰¾å‡ºåº“任务
                            Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.orderNo && x.WarehouseCode == WarehouseEnum.立库.ObjToInt().ToString("000") && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
                            if (supplyTask == null) throw new Exception($"未找到订单号【{request.orderNo}】物料编号【{detail.productCode}】的出库任务");
                            #endregion

                            #region å¤„理出库单、库存信息、出库任务、调拨任务
                            _deliveryOrderServices.OutTaskFinish(supplyTask);
                            #endregion
                            break;

                        case "3": // ç›˜ç‚¹
@@ -204,33 +256,21 @@
                            if (flag == 1) // ç›˜äº
                            {
                                //库存数-差异数=盘亏
                                batch.SupplyQuantity +=( batch.StockQuantity - diff);
                                batch.Remark = "盘点单回传 - ç›˜äº";
                                //batch.SupplyQuantity += (batch.StockQuantity - diff);
                                //batch.Remark = "盘点单回传 - ç›˜äº";
                            }
                            else if (flag == 2) // ç›˜ç›ˆ
                            {
                                //库存数+差异数=盘盈
                                batch.SupplyQuantity +=(batch.StockQuantity + diff);
                                batch.Remark = "盘点单回传 - ç›˜ç›ˆ";
                                //batch.SupplyQuantity += (batch.StockQuantity + diff);
                                //batch.Remark = "盘点单回传 - ç›˜ç›ˆ";
                            }
                            else // ç›˜ä¸­
                            {
                                batch.Remark = "盘点单回传 - ç›˜ä¸­";
                                //batch.Remark = "盘点单回传 - ç›˜ä¸­";
                            }
                            break;
                    }
                    // 2️⃣ å¼€å¯äº‹åŠ¡
                    BaseDal.Db.Ado.BeginTran();
                    // 8️⃣ ä¿å­˜æ•°æ®
                    if (entity.Id == 0)
                        BaseDal.Db.Insertable(entity).ExecuteCommand();
                    else
                        BaseDal.Db.Updateable(entity).ExecuteCommand();

                    if (batch.Id == 0)
                        BaseDal.Db.Insertable(batch).ExecuteCommand();
                    else
                        BaseDal.Db.Updateable(batch).ExecuteCommand();
                }

                // 9️⃣ æäº¤äº‹åŠ¡
@@ -261,7 +301,7 @@
        /// </summary>
        /// <param name="batchNo">批次号</param>
        /// <param name="productCode">物料名编码/param>
        public void UpdateInboundOrderDetailStatus(string batchNo,string productCode)
        public void UpdateInboundOrderDetailStatus(string orderNo, string batchNo, string productCode)
        {
            try
            {
@@ -300,7 +340,7 @@

                throw;
            }
         


        }