1

dengjunjie

2025-01-18 f4b5b9acda31ad3908bb5cbb2c1910b7fb982bca

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs

@@ -15,6 +15,9 @@
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using MailKit.Search;
using WIDESEA_External.Model;
using WIDESEA_Core.CodeConfigEnum;

namespace WIDESEA_TaskInfoService
{
@@ -30,13 +33,13 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x=>x.Id==id).Includes(x=>x.Details).First();
                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.Id == id).Includes(x => x.Details).First();
                if (stockInfo == null)
                {
                    return content.Error($"未找到库存");
                }
                Dt_LocationInfo locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
                if (locationInfo!=null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus==LocationStatusEnum.InStock.ObjToInt() && stockInfo.StockStatus==StockStatusEmun.入库完成.ObjToInt())
                if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && stockInfo.StockStatus == StockStatusEmun.入库完成.ObjToInt())
                {
                    List<Dt_Task> tasks = GetTasks(new List<Dt_StockInfo>() { stockInfo }, TaskTypeEnum.Outbound);
                    if (tasks == null || tasks.Count <= 0)
@@ -187,7 +190,10 @@
            {
                throw new Exception("未找到出库单明细信息");
            }

            if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
            {
                throw new Exception("所选出库单明细存在出库中或已完成");
            }
            List<Dt_StockInfo>? stockInfos = null;
            List<Dt_OutboundOrderDetail>? orderDetails = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
@@ -253,6 +259,157 @@
        }

        /// <summary>
        /// å¹³åº“直接出库
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        public WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
        {
            try
            {
                #region MyRegion
                Dt_OutboundOrderDetail OrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);

                if (OrderDetail == null)
                {
                    throw new Exception("未找到出库单明细信息");
                }
                if (OrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
                    throw new Exception("出库单已完成");
                Dt_OutboundOrder outboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == OrderDetail.OrderId).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到出库单信息");
                }
                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId);
                List<Dt_StockInfo> outStocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockSelectViews.Select(x => x.PalletCode).ToList());
                if (outStocks.Count < 1) return WebResponseContent.Instance.Error($"库存不足");
                List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                List<Dt_StockInfo> upStocks = new List<Dt_StockInfo>();
                List<Dt_StockInfo> deStocks = new List<Dt_StockInfo>();
                List<Dt_StockInfoDetail> upstockDetails = new List<Dt_StockInfoDetail>();
                List<Dt_StockInfoDetail> destockDetails = new List<Dt_StockInfoDetail>();
                outStocks.ForEach(x =>
                {
                    x.Details.Where(x => x.MaterielCode == OrderDetail.MaterielCode).ToList().ForEach(v =>
                    {
                        float OriginalQuantity = v.StockQuantity;
                        float assignQuantity = 0;//分配数量
                        float assignAmount = OrderDetail.OrderQuantity - OrderDetail.OverOutQuantity;//待出数量
                        if (assignAmount > 0)
                        {
                            if (v.StockQuantity >= assignAmount)
                            {
                                assignQuantity = assignAmount;
                                v.StockQuantity -= assignAmount;
                                OrderDetail.OverOutQuantity += assignAmount;
                                OrderDetail.LockQuantity += assignAmount;
                                upstockDetails.Add(v);
                            }
                            else
                            {
                                assignQuantity = v.StockQuantity;
                                OrderDetail.OverOutQuantity += v.StockQuantity;
                                OrderDetail.LockQuantity += v.StockQuantity;
                                v.StockQuantity = 0;
                                destockDetails.Add(v);
                            }
                            Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
                            {
                                PalletCode = x.PalletCode,
                                AssignQuantity = assignQuantity,
                                MaterielCode = OrderDetail.MaterielCode,
                                BatchNo = v.BatchNo,
                                LocationCode = x.LocationCode,
                                MaterielName = v.MaterielName,
                                OrderDetailId = OrderDetail.Id,
                                OrderNo = outboundOrder.OrderNo,
                                OrderType = outboundOrder.OrderType,
                                OriginalQuantity = OriginalQuantity,
                                Status = OutLockStockStatusEnum.出库完成.ObjToInt(),
                                StockId = x.Id,
                                TaskNum = 0,
                                OrderQuantity = OrderDetail.OrderQuantity,
                                Unit = OrderDetail.Unit
                            };
                            outStockLockInfos.Add(outStockLockInfo);
                        }
                    });
                    int overCount = x.Details.Where(x => x.StockQuantity == 0).Count();
                    if (overCount == x.Details.Count) deStocks.Add(x);
                    else upStocks.Add(x);
                });
                outboundOrder.OrderStatus = OutOrderStatusEnum.出库中.ObjToInt();
                OrderDetail.OrderDetailStatus = OrderDetail.OrderQuantity > OrderDetail.OverOutQuantity ? OrderDetailStatusEnum.AssignOverPartial.ObjToInt() : OrderDetailStatusEnum.Over.ObjToInt();
                if (OrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
                {
                    int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
                    if (outboundOrder.Details.Count - 1 == overCount)
                        outboundOrder.OrderStatus = OutOrderStatusEnum.出库完成.ObjToInt();
                }
                _unitOfWorkManage.BeginTran();
                _outboundService.OutboundStockLockInfoService.AddData(outStockLockInfos);
                _outboundService.OutboundOrderService.UpdateData(outboundOrder);
                _outboundService.OutboundOrderDetailService.UpdateData(OrderDetail);
                _stockRepository.StockInfoRepository.UpdateData(upStocks);
                _stockRepository.StockInfoRepository.DeleteData(deStocks);
                _stockRepository.StockInfoDetailRepository.UpdateData(upstockDetails);
                _stockRepository.StockInfoDetailRepository.DeleteData(destockDetails);
                _unitOfWorkManage.CommitTran();
                #endregion

                #region ä¸ŠæŠ¥ERP
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    //List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
                    //outStockLockInfos.ForEach(x =>
                    //{
                    //    ERPPickItemModel pickItemModel = new ERPPickItemModel()
                    //    {
                    //        Lotno = x.BatchNo,
                    //        Qty = x.AssignQuantity.ToString(),
                    //        Location = warehouse.WarehouseCode
                    //    };
                    //    ERPPickModel pickModel = new ERPPickModel()
                    //    {
                    //        Rowindex = OrderDetail.RowNo,
                    //        Material = OrderDetail.MaterielCode,
                    //        Qty = pickItemModel.Qty,
                    //        Dataitem = new List<ERPPickItemModel> { pickItemModel }
                    //    };
                    //    eRPPickModels.Add(pickModel);
                    //});
                    //ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
                    //{
                    //    Pickcode = outboundOrder.UpperOrderNo,
                    //    PickList = eRPPickModels
                    //};
                    //ERPIssueModel issueModel = new ERPIssueModel()
                    //{
                    //    UniqueTag = outboundOrder.Id.ToString(),
                    //    Code = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                    //    WarehouseCode = warehouse.WarehouseCode,
                    //    Docremark = "",
                    //    Deptno = outboundOrder.DepartmentCode,
                    //    Deptname = outboundOrder.DepartmentName,
                    //    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    //    Createuser = App.User.UserName,
                    //    Issitem = new List<ERPIssueItemModel>() { issueItemModel }
                    //};
                    _invokeERPService.InvokeOutStandardsApi(_outboundService.OutboundOrderService.GetERPIssueModel(outboundOrder, warehouse.WarehouseCode));
                }
                #endregion

                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务后数据更新到数据库
        /// </summary>
        /// <param name="tasks"></param>
@@ -304,7 +461,7 @@
        /// </summary>
        /// <param name="keys">出库单明细主键</param>
        /// <returns></returns>
        public WebResponseContent GenerateOutboundTask(int[] keys)
        public WebResponseContent GenerateOutboundTasks(int[] keys)
        {
            try
            {
@@ -358,7 +515,7 @@
            {
                List<int> keys = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => x.Id, x => x.OrderId == outboundId);

                return GenerateOutboundTask(keys.ToArray());
                return GenerateOutboundTasks(keys.ToArray());
            }
            catch (Exception ex)
            {