优化

yanjinhui

3 天以前 c034f4a7282f8b8d49e8468b6fd0acb60d8dfcc0

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

@@ -1,11 +1,8 @@
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 SqlSugar;
using WIDESEA_Common;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
@@ -26,12 +23,19 @@
{
    public class InventoryServices : ServiceBase<Dt_Inventory, IRepository<Dt_Inventory>>, IInventoryServices
    {
        private readonly ICabinOrderServices _cabinOrderServices;
        private readonly IDeliveryOrderServices _deliveryOrderServices;
        public InventoryServices(IRepository<Dt_Inventory> BaseDal, IDeliveryOrderServices deliveryOrderServices) : base(BaseDal)
        private readonly ISupplyTaskService _supplyTaskService;
        private readonly IInventory_BatchServices _inventoryBatchServices;
        private readonly IMessageInfoService _infoService;
        public InventoryServices(IRepository<Dt_Inventory> BaseDal, ICabinOrderServices cabinOrderServices, IDeliveryOrderServices deliveryOrderServices, ISupplyTaskService supplyTaskService, IInventory_BatchServices inventoryBatchServices, IMessageInfoService infoService) : base(BaseDal)
        {
            _cabinOrderServices = cabinOrderServices;
            _deliveryOrderServices = deliveryOrderServices;
            _supplyTaskService = supplyTaskService;
            _inventoryBatchServices = inventoryBatchServices;
            _infoService = infoService;
        }


        /// <summary>
        /// èŽ·å–上游库存信息
@@ -40,59 +44,149 @@
        /// <param name="batch_num">批号</param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent GetInventoryList(string goods_no, string batch_num)
        public WebResponseContent GetInventoryList(int[] key)
        {
            var responseContent = new WebResponseContent();
            try
            {
                var url = "http://121.37.118.63/GYZ2/95fck/repositoryInfo";
                var result = HttpHelper.Post(url, new { goods_no, batch_num }.ToJsonString());

                var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);
                List<Dt_Inventory_Batch> UpdateBatches = new List<Dt_Inventory_Batch>();
                //根据id查询库存批次信息表，获取到他们的商品编码和批次号
                var inventoryBatches = _inventoryBatchServices.Repository.QueryData(); //查全部

                if (response.resultCode != "0")
                var inventory = inventoryBatches.Where(x => key.Contains(x.Id)).Select(x => new { x.MaterielCode, x.BatchNo }).ToList();
                if (inventory.Count < 1)
                {
                    SendErrorToUpstream(8, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                    return WebResponseContent.Instance.Error("没有找到库存批次信息");
                }

                if (response.data == null || !response.data.Any())
                {
                    return responseContent.OK("无新库存数据");
                }
                var requestData = inventory.Select(x => new { goods_no = x.MaterielCode, batch_num = x.BatchNo }).Distinct().ToList();

                Db.Ado.BeginTran();
                foreach (var item in response.data)
                foreach (var item in requestData)
                {
                    // ä½¿ç”¨ FirstOrDefault é¿å…æ‰¾ä¸åˆ°è®°å½•æ—¶æŠ›å‡ºå¼‚常
                    var Inver = Db.Queryable<Dt_Inventory_Batch>()
                        .First(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
                   
                    var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/370999979?apifoxApiId=370999979";
                    var result = HttpHelper.Post(url, new { item.goods_no, item.batch_num }.ToJsonString());

                    if (Inver != null)
                    var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);

                    if (response.resultCode != "0")
                    {
                        Inver.ERPStockQuantity = item.business_qty;
                        Db.Updateable(Inver).ExecuteCommand();
                        //return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                        _infoService.AddMessageInfo(MessageGroupByEnum.SynchronismAlarm, "Erp同步失败", "上游接口返回失败");
                        continue;
                        
                    }

                    if (response.data == null || !response.data.Any())
                    {
                        return responseContent.OK("无新库存数据");
                    }
                    var materialCodes = response.data.Select(x => x.goods_no).Distinct().ToList();
                    var batchNos = response.data.Select(x => x.batch_num).Distinct().ToList();
                    foreach (var inventoryInfo in response.data)
                    {
                        //// ä½¿ç”¨ FirstOrDefault é¿å…æ‰¾ä¸åˆ°è®°å½•æ—¶æŠ›å‡ºå¼‚常
                        var Inver = inventoryBatches.FirstOrDefault(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);

                        if (Inver != null)
                        {
                            Inver.ERPStockQuantity = inventoryInfo.business_qty;
                            UpdateBatches.Add(Inver);
                        }
                    }
                }
                Db.Ado.CommitTran();
                _inventoryBatchServices.UpdateData(UpdateBatches);
                return responseContent.OK("库存信息同步完成");

            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                SendErrorToUpstream(8, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
     


        public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
        {
            try
            {
                if (request == null || request.details == null || request.details.Count < 1) throw new Exception("请求参数无效");
                var Warecode = WarehouseEnum.立库.ObjToInt().ToString("000");
                switch (request.orderType)
                {
                    case "1": //入库
                        {
                            Dt_CabinOrder cabinOrder = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.externalOrderNo && x.Warehouse_no == Warecode).Includes(x => x.Details).First();
                            if (cabinOrder == null) throw new Exception($"未找到入库单号【{request.externalOrderNo}】的入库单信息");
                            if (cabinOrder.OdrderStatus == "已完成")
                                return new ApiResponse<Dt_InventoryInfo> { code = "0", msg = $"成功" };
                            WebResponseContent content = _cabinOrderServices.CompleteLKInOrder(cabinOrder, request);
                            if (!content.Status) throw new Exception(content.Message);
                        }
                        break;
                    case "2":
                        {
                            Dt_DeliveryOrder deliveryOrder = _deliveryOrderServices.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.externalOrderNo && x.Warehouse_no == Warecode).Includes(x => x.Details).First();
                            if (deliveryOrder == null) throw new Exception($"未找到出库单号【{request.externalOrderNo}】的出库单信息");
                            if (deliveryOrder.OutStatus == "已完成")
                                return new ApiResponse<Dt_InventoryInfo> { code = "0", msg = $"成功" };
                            WebResponseContent content = _deliveryOrderServices.CompleteLKOutOrder(deliveryOrder, request);
                            if (!content.Status) throw new Exception(content.Message);
                        }
                        break;
                    case "3":
                        {
                            #region æ‰¾ç›˜ç‚¹ä»»åŠ¡
                            List<Dt_SupplyTask> supplyTasks = _supplyTaskService.Repository.QueryData(x => x.OrderNo == request.externalOrderNo && x.WarehouseCode == Warecode && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt());
                            foreach (var detail in request.details)
                            {
                                Dt_SupplyTask? supplyTask = supplyTasks.Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo).FirstOrDefault();
                                if (supplyTask == null) throw new Exception($"未找到订单号【{request.externalOrderNo}】物料编号【{detail.productCode}】的盘点任务");
                                if (detail.isLossOrProfit == 1) // ç›˜äº
                                {
                                    supplyTask.SupplyQuantity = supplyTask.StockQuantity - detail.ea;
                                }
                                else if (detail.isLossOrProfit == 2) // ç›˜ç›ˆ
                                {
                                    supplyTask.SupplyQuantity = supplyTask.StockQuantity + detail.ea;
                                }
                                else // ç›˜ä¸­
                                {
                                    supplyTask.SupplyQuantity = supplyTask.StockQuantity;
                                }
                                var content = _deliveryOrderServices.CheckTaskFinish(supplyTask);
                                if (!content.Status) throw new Exception(content.Message);
                            }
                            #endregion
                        }
                        break;
                    default:
                        throw new Exception($"未定义的类型【{request.orderType}】");
                }
                return new ApiResponse<Dt_InventoryInfo>
                {
                    code = "0",
                    msg = $"成功"
                };
            }
            catch (Exception ex)
            {
                return new ApiResponse<Dt_InventoryInfo>
                {
                    code = "500",
                    msg = $"处理失败: {ex.Message}"
                };
            }
        }

        /// <summary>
        /// wcs回传给我调用我的方法 ä¸ç®¡æ˜¯å…¥åº“ å‡ºåº“ ç›˜ç‚¹éƒ½ä¼šè°ƒç”¨è¿™ä¸ªæŽ¥å£
        /// </summary>
        /// <param name="request"></param>
        /// <returns></returns>
        public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
        public ApiResponse<Dt_InventoryInfo> OrderFeedback1(EdiOrderCallbackRequest request)
        {
            try
            {
@@ -101,9 +195,9 @@
                {
                    return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "请求参数无效" };
                }

                var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
                // 2️⃣ å¼€å¯äº‹åŠ¡
                BaseDal.Db.Ado.BeginTran();
                //BaseDal.Db.Ado.BeginTran();
                foreach (var detail in request.details)
                {
                    #region æŸ¥è¯¢ç‰©æ–™ä¿¡æ¯ã€è®¡ç®—总和
@@ -122,161 +216,281 @@
                        case "1": //入库
                            {
                                #region å¤„理入库订单
                                var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
                                Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no ==reslut).Includes(x => x.Details).First();
                                //Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.orderNo && x.Warehouse_no == "001").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 == reslut).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)
                                Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.externalOrderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
                                if (cabinOrder == null) throw new Exception($"未找到入库单号【{request.externalOrderNo}】的入库单信息");
                                #region åˆ¤æ–­æ˜¯å¦ä¸ºç›˜ç›ˆå…¥åº“单
                                if (cabinOrder.Order_type == "5")
                                {
                                    inventoryInfo.StockQuantity += orderQty;
                                    inventoryInfo.AvailableQuantity += orderQty;
                                    inventoryInfo.InDate = DateTime.Now;
                                    BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
                                }
                                else
                                {
                                    inventoryInfo = new Dt_InventoryInfo
                                    foreach (var item in cabinOrder.Details)
                                    {
                                        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();
                                        Dt_InventoryInfo inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                                        .First(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.LocationCode == reslut);
                                        var qty = inventoryInfo.SupplyQuantity - inventoryInfo.StockQuantity;
                                        if (orderQty != qty)
                                            throw new Exception($"盘盈入库数量不一致,上传数量【{orderQty}】,库存盘盈数量【{qty}】");
                                        inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
                                        inventoryInfo.SupplyQuantity = 0;
                                        inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                                        #region æ·»åŠ ç›˜ç›ˆå…¥åº“任务
                                        Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
                                        {
                                            WarehouseCode = inventoryInfo.WarehouseCode,
                                            OperateType = OperateTypeEnum.自动完成.ToString(),
                                            InsertTime = DateTime.Now,
                                            TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
                                            BatchNo = inventoryInfo.BatchNo,
                                            MaterielName = inventoryInfo.MaterielName,
                                            MaterielCode = inventoryInfo.MaterielCode,
                                            MaterielSpec = inventoryInfo.MaterielSpec,
                                            TaskType = TaskTypeEnum.ChenckIn.ObjToInt(),
                                            CreateDate = DateTime.Now,
                                            Creater = App.User.UserName,
                                            LocationCode = inventoryInfo.LocationCode,
                                            OrderNo = cabinOrder.Order_no,
                                            StockQuantity = orderQty,
                                            SupplyQuantity = 0,
                                            Remark = "盘盈入库"
                                        };
                                        #endregion
                                        var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                                        .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
                                        inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
                                        inventory_Batch.SupplyQuantity = 0;
                                        item.OrderDetailStatus = "已完成";
                                        BaseDal.Db.Updateable(item).ExecuteCommand();
                                        BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
                                        BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
                                        BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
                                    }
                                    var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Id == cabinOrder.Id).Includes(x => x.Details).First();
                                    if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "已完成").Any())
                                        cabinOrder.OdrderStatus = "已完成";
                                    BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
                                }
                                #endregion

                                #region åˆ›å»ºåº“存批次信息
                                // 6️⃣ æŸ¥è¯¢åº“存批次信息
                                var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                                    .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);

                                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
                                    if (cabinOrder.OdrderStatus == "已完成")
                                        return new ApiResponse<Dt_InventoryInfo>
                                        {
                                            code = "0",
                                            msg = "成功"
                                        };
                                    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 == reslut).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)
                                    {
                                        MaterielCode = inventoryInfo.MaterielCode,
                                        MaterielName = inventoryInfo.MaterielName,
                                        MaterielSpec = inventoryInfo.MaterielSpec,
                                        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 = "智能立库"
                                        };
                                        BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
                                    }
                                    #endregion

                                    #region åˆ›å»ºåº“存批次信息  åªæœ‰ä¸æ˜¯è°ƒæ‹¨å…¥åº“单（115）才对批次信息进行修改
                                    if (cabinOrder.Order_type != InOrderTypeEnum.Allocat.ObjToInt().ToString())
                                    {
                                        // 6️⃣ æŸ¥è¯¢åº“存批次信息
                                        var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                                            .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);

                                        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.ObjToDate(),
                                                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,
                                        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 = "自动创建"
                                        MaterielName = inventoryInfo.MaterielName,
                                        MaterielCode = inventoryInfo.MaterielCode,
                                        MaterielSpec = inventoryInfo.MaterielSpec,
                                        TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
                                        CreateDate = DateTime.Now,
                                        Creater = App.User.UserName,
                                        LocationCode = inventoryInfo.LocationCode,
                                        OrderNo = cabinOrder.Order_no,
                                        StockQuantity = orderQty,
                                        SupplyQuantity = 0,
                                        Remark = "入库"
                                    };
                                    BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
                                    //这里这里的入库调拨单状态是115，就将调拨任务状态改为7
                                    if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString()) supplyTask_Hty.TaskType = TaskTypeEnum.AllocatIn.ObjToInt();
                                    BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
                                    #endregion
                                }
                                #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

                                //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 "2":
                            {
                                Dt_DeliveryOrder cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.externalOrderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
                                if (cabinOrder == null) throw new Exception($"未找到出库单号【{request.externalOrderNo}】的出库单信息");

                                if (cabinOrder.Out_type == "6")
                                {
                                    foreach (var item in cabinOrder.Details)
                                    {
                                        Dt_InventoryInfo inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                                        .First(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.LocationCode == reslut);
                                        var qty = inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity;
                                        if (orderQty != qty)
                                            throw new Exception($"盘亏出库数量不一致,上传数量【{orderQty}】,库存盘亏数量【{qty}】");
                                        inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
                                        inventoryInfo.SupplyQuantity = 0;
                                        inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                                        #region æ·»åŠ ç›˜äºå‡ºåº“任务
                                        Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
                                        {
                                            WarehouseCode = inventoryInfo.WarehouseCode,
                                            OperateType = OperateTypeEnum.自动完成.ToString(),
                                            InsertTime = DateTime.Now,
                                            TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
                                            BatchNo = inventoryInfo.BatchNo,
                                            MaterielName = inventoryInfo.MaterielName,
                                            MaterielCode = inventoryInfo.MaterielCode,
                                            MaterielSpec = inventoryInfo.MaterielSpec,
                                            TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
                                            CreateDate = DateTime.Now,
                                            Creater = App.User.UserName,
                                            LocationCode = inventoryInfo.LocationCode,
                                            OrderNo = cabinOrder.Out_no,
                                            StockQuantity = orderQty,
                                            SupplyQuantity = 0,
                                            Remark = "盘亏出库"
                                        };
                                        #endregion
                                        var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
                                        .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
                                        inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
                                        inventory_Batch.SupplyQuantity = 0;
                                        item.OotDetailStatus = "已完成";
                                        BaseDal.Db.Updateable(item).ExecuteCommand();
                                        BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
                                        BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
                                        BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
                                    }
                                    var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Id == cabinOrder.Id).Includes(x => x.Details).First();
                                    if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "已完成").Any())
                                        cabinOrder.OutStatus = "已完成";
                                    BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
                                }
                                else
                                {
                                    #region æ‰¾å‡ºåº“任务
                                    Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.externalOrderNo && x.WarehouseCode == reslut && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
                                    if (supplyTask == null) throw new Exception($"未找到订单号【{request.externalOrderNo}】物料编号【{detail.productCode}】的出库任务");
                                    if (supplyTask.StockQuantity != orderQty) throw new Exception($"订单号【{request.orderNo}】物料编号【{detail.productCode}】的出库数量与出库任务数量不相等");
                                    #endregion

                                    #region å¤„理出库单、库存信息、出库任务、调拨任务
                                    var content = _deliveryOrderServices.OutTaskFinish(supplyTask);
                                    if (!content.Status) throw new Exception(content.Message);
                                    #endregion
                                }
                            }
                            break;
                        case "3": // ç›˜ç‚¹
                            decimal diff = detail.ea ?? 0;             // å·®å¼‚æ•°
                            int flag = detail.isLossOrProfit ?? 3;     // 1=盘亏, 2=盘盈, 3=盘中
                            if (flag == 1) // ç›˜äº
                            {
                                //库存数-差异数=盘亏
                                //batch.SupplyQuantity += (batch.StockQuantity - diff);
                                //batch.Remark = "盘点单回传 - ç›˜äº";
                            }
                            else if (flag == 2) // ç›˜ç›ˆ
                            {
                                //库存数+差异数=盘盈
                                //batch.SupplyQuantity += (batch.StockQuantity + diff);
                                //batch.Remark = "盘点单回传 - ç›˜ç›ˆ";
                            }
                            else // ç›˜ä¸­
                            {
                                //batch.Remark = "盘点单回传 - ç›˜ä¸­";
                                var WarehouseLK = WarehouseEnum.立库.ObjToInt().ToString("000");
                                #region æ‰¾ç›˜ç‚¹ä»»åŠ¡
                                Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.externalOrderNo && x.WarehouseCode == WarehouseLK && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).First();
                                if (supplyTask == null) throw new Exception($"未找到订单号【{request.externalOrderNo}】物料编号【{detail.productCode}】的盘点任务");
                                #endregion
                                if (detail.isLossOrProfit == 1) // ç›˜äº
                                {
                                    supplyTask.SupplyQuantity = supplyTask.StockQuantity - detail.ea;
                                }
                                else if (detail.isLossOrProfit == 2) // ç›˜ç›ˆ
                                {
                                    supplyTask.SupplyQuantity = supplyTask.StockQuantity + detail.ea;
                                }
                                else // ç›˜ä¸­
                                {
                                    supplyTask.SupplyQuantity = supplyTask.StockQuantity;
                                }
                                var content = _deliveryOrderServices.CheckTaskFinish(supplyTask);
                                if (!content.Status) throw new Exception(content.Message);
                            }
                            break;
                    }
                }

                // 9️⃣ æäº¤äº‹åŠ¡
                BaseDal.Db.Ado.CommitTran();
                //BaseDal.Db.Ado.CommitTran();

                return new ApiResponse<Dt_InventoryInfo>
                {
@@ -287,13 +501,15 @@
            catch (Exception ex)
            {
                // ðŸ”Ÿ å›žæ»šäº‹åŠ¡
                BaseDal.Db.Ado.RollbackTran();
                //BaseDal.Db.Ado.RollbackTran();

                return new ApiResponse<Dt_InventoryInfo>
                {
                    code = "500",
                    msg = $"处理失败: {ex.Message}"
                };

                //Console.WriteLine(ex.Message);
            }
        }