1

wankeda

2025-03-07 b55d324f4b7465f9a7dc50e999346697f5cc35a2

 WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs

@@ -3,10 +3,12 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_BasicRepository;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -17,9 +19,11 @@
using WIDESEA_DTO;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
using WIDESEA_InboundRepository;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_Model.Models;
@@ -32,7 +36,8 @@
        private readonly IMapper _mapper;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly ITaskRepository _taskRepository;

        private readonly IInboundRepository _inboundRepository;
        private readonly IBasicRepository _basicRepository;
        private IBasicService _basicService;
        private IStockService _stockService;
        private IInboundOrderDetailService _inboundOrderDetailService;
@@ -41,89 +46,145 @@

        public IInboundOrderRepository Repository => BaseDal;

        public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IBasicService basicService, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService) : base(BaseDal)
        public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService,IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService) : base(BaseDal)
        {
            _mapper = mapper;
            _unitOfWorkManage = unitOfWorkManage;
            _taskRepository = taskRepository;
            _basicService = basicService;
            _stockService = stockService;
            _inboundRepository = inboundRepository;
            _basicRepository = basicRepository;
            _inboundOrderDetailService = inboundOrderDetailService;
            _inboundOrderHtyService = inboundOrderHtyService;
            _inboundOrderDetail_HtyService = inboundOrderDetail_HtyService;
            _basicService = basicService;
        }

        /// <summary>
        /// 添加单据
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        public override WebResponseContent AddData(SaveModel saveModel)
        {
            InboundOrderAddDTO orderAddDTO = saveModel.MainData.DicToModel<InboundOrderAddDTO>();
            orderAddDTO.Details = saveModel.DetailData.DicToIEnumerable<InboundOrderDetailAddDTO>();
            return AddInboundOrder(orderAddDTO);
        }

        /// <summary>
        /// 添加单据
        /// </summary>
        /// <param name="orderAddDTO">单据添加DTO</param>
        /// <returns></returns>
        public WebResponseContent AddInboundOrder(InboundOrderAddDTO orderAddDTO)
        {
            WebResponseContent content = new();
            try
            {
                #region 验证数据
                (bool, string, object?) result = CheckInboundOrderAddData(orderAddDTO);
                if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                #endregion

                Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO);
                inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            finally
            {

            }
            return content;
        }
        /// <summary>
        /// 入库单据下发
        /// </summary>
        /// <param name="orderAddDTO"></param>
        /// <returns></returns>
        public WebResponseContent AddInboundOrders(HouseInbound orderAddDTO)
        public WebResponseContent AddInboundOrders(HouseInbound model)
        {
            WebResponseContent content = new();
            WebResponseContent content = new WebResponseContent();
            try
            {
                InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();
                orderAddDTO1.OrderNo = orderAddDTO.AsnNo;
                orderAddDTO1.UpperOrderNo = orderAddDTO.AsnNo;
                orderAddDTO1.OutWareHouse = orderAddDTO.InWarehouse;
                orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
                orderAddDTO1.InoutType = orderAddDTO.OrderType;
                orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
                orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<InboundOrderDetailAddDTO>();
                #region 验证数据
                (bool, string, object?) result = CheckInboundOrderAddData(orderAddDTO1);
                if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                #endregion
                foreach (var item in model.DetailList)
                {
                    //获取物料信息
                    Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == item.MaterielCode);
                    if (materielInfo == null)
                    {
                        return content.Error($"物料{item.MaterielCode}不存在!");
                    }
                    Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.InWarehouse);
                    if (warehouse == null)
                    {
                        return content.Error($"未找到仓库信息");
                    }
                    Dt_InboundOrder inboundOrderOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.AsnNo).Includes(x => x.Details).First();
                    if (inboundOrderOld != null)
                    {
                        if (inboundOrderOld.OrderStatus != OrderDetailStatusEnum.New.ObjToInt())
                        {
                            return content.Error($"{model.AsnNo}单据已开始!");
                        }
                        Dt_InboundOrderDetail? inboundOrderDetailOld = inboundOrderOld.Details?.FirstOrDefault(x => x.LinId == item.LinId && x.MaterielCode == item.MaterielCode);
                        if (inboundOrderDetailOld != null)
                        {
                            inboundOrderDetailOld.OrderQuantity += item.OrderQuantity;
                            _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
                        }
                        else
                        {
                            Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
                            {
                                OrderId = inboundOrderOld.Id,
                                MaterielCode = item.MaterielCode,
                                BatchNo = "",
                                OrderQuantity = item.OrderQuantity,
                                ReceiptQuantity = 0,
                                OverInQuantity = 0,
                                OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                                LinId = item.LinId,
                                MaterielName = materielInfo.MaterielName,
                                MaterieSpec = materielInfo.MaterieSpec
                            };
                            _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
                        }
                    }
                    else
                    {
                        Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
                        {
                            OrderId = inboundOrderOld.Id,
                            MaterielCode = item.MaterielCode,
                            BatchNo = item.BatchNo,
                            OrderQuantity = item.OrderQuantity,
                            ReceiptQuantity = 0,
                            OverInQuantity = 0,
                            OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                            LinId = item.LinId,
                            LPNNo=item.LPN_No,
                            MaterielName = item.MaterielName,
                            MaterieSpec = item.MaterieSpec
                        };

                Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO1);
                inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                inboundOrder.Creater = "WMS";
                inboundOrder.CreateDate = DateTime.Now;
                bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                        Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
                        {
                            UpperOrderNo = model.AsnNo,
                            WarehouseId = warehouse.WarehouseId,
                            //SupplierId = "",
                            OrderStatus = InboundStatusEnum.未开始.ObjToInt(),
                            CreateType = CreateType.UpperSystemPush.ObjToInt(),
                            Remark = "",
                            TransactionCode = model.TransactionCode,
                            InoutType = model.OrderType,
                            OrderType = model.InoutType.ObjToInt(),
                            Details = new List<Dt_InboundOrderDetail> { orderDetail }
                        };
                        //switch (model.OrderType)//单据类型
                        //{
                        //    case 1:
                        //        inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
                        //        break;
                        //    case 3:
                        //        inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
                        //        break;
                        //    case 6:
                        //        inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
                        //        break;
                        //    default:
                        //        break;
                        //};
                        Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                    }
                }
                content = WebResponseContent.Instance.OK();




                //InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();
                //orderAddDTO1.OrderNo = orderAddDTO.AsnNo;
                //orderAddDTO1.UpperOrderNo = orderAddDTO.AsnNo;
                //orderAddDTO1.OutWareHouse = orderAddDTO.InWarehouse;
                //orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
                //orderAddDTO1.InoutType = orderAddDTO.OrderType;
                //orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
                //orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<InboundOrderDetailAddDTO>();
                //#region 验证数据
                //(bool, string, object?) result = CheckInboundOrderAddData(orderAddDTO1);
                //if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                //#endregion

                //Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO1);
                //inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                //inboundOrder.Creater = "WMS";
                //inboundOrder.CreateDate = DateTime.Now;
                //bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();

            }
            catch (Exception ex)
            {
@@ -182,7 +243,7 @@
            return content;
        }
        /// <summary>
        /// 入库取消
        /// 入库单据取消
        /// </summary>
        /// <param name="houseInventoryIn"></param>
        /// <returns></returns>
@@ -194,7 +255,7 @@
                InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();
                orderAddDTO1.OrderNo = houseCancelIn.AsnNo;
                orderAddDTO1.Details = houseCancelIn.DetailList.DicToIEnumerable<InboundOrderDetailAddDTO>();
                Dt_InboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
                Dt_InboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
                Dt_InboundOrderDetail dt_InboundOrderDetail = BaseDal.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == oldOutboundOrder.Id).First();
                if (oldOutboundOrder.OrderStatus != InboundStatusEnum.未开始.ObjToInt())
                {
@@ -209,8 +270,8 @@
                    CreateType = oldOutboundOrder.CreateType,
                    //SourceId = oldOutboundOrder.SourceId,
                    UpperOrderNo = oldOutboundOrder.UpperOrderNo,
                    OrderNo = oldOutboundOrder.OrderNo,
                    OutWareHouse = oldOutboundOrder.OutWareHouse,
                    //OrderNo = oldOutboundOrder.OrderNo,
                    //OutWareHouse = oldOutboundOrder.OutWareHouse,
                    TransactionCode = oldOutboundOrder.TransactionCode,
                    InoutType = oldOutboundOrder.InoutType,
                    OrderType = oldOutboundOrder.OrderType,
@@ -237,19 +298,6 @@
                    _inboundOrderDetailService.DeleteData(item);
                }
                BaseDal.DeleteData(oldOutboundOrder);

                //inboundOrder_Hty.Details = oldOutboundOrder.Details;

                //#region 验证数据
                //(bool, string, object?) result = CheckInboundOrderAddData(orderAddDTO1);
                //#endregion

                //Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO1);
                //inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                //inboundOrder.OrderType = OutOrderTypeEnum.OutInventory.ObjToInt();
                //inboundOrder.Creater = "WMS";
                //inboundOrder.CreateDate = DateTime.Now;
                //bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -268,32 +316,36 @@
        /// </summary>
        /// <param name="inboundOrderAddDTO">单据添加DTO</param>
        /// <returns></returns>
        private (bool, string, object?) CheckInboundOrderAddData(InboundOrderAddDTO inboundOrderAddDTO)
        {
            (bool, string, object?) result1 = ModelValidate.ValidateModelData(inboundOrderAddDTO);
            if (!result1.Item1) return result1;
        //private (bool, string, object?) CheckInboundOrderAddData(InboundOrderAddDTO inboundOrderAddDTO)
        //{
        //    (bool, string, object?) result1 = ModelValidate.ValidateModelData(inboundOrderAddDTO);
        //    if (!result1.Item1) return result1;

            (bool, string, object?) result2 = ModelValidate.ValidateModelData(inboundOrderAddDTO.Details);
            if (!result2.Item1) return result2;
        //    (bool, string, object?) result2 = ModelValidate.ValidateModelData(inboundOrderAddDTO.Details);
        //    if (!result2.Item1) return result2;

            IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
            if (!inOrderTypes.Contains(inboundOrderAddDTO.OrderType))
            {
                return (false, "未找到该单据类型", inboundOrderAddDTO);
            }
        //    IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
        //    if (!inOrderTypes.Contains(inboundOrderAddDTO.OrderType))
        //    {
        //        return (false, "未找到该单据类型", inboundOrderAddDTO);
        //    }

            List<string> materielCodes = inboundOrderAddDTO.Details.Select(x => x.MaterielCode).ToList();
            if (!_basicService.MaterielInfoService.ExsitMateriels(materielCodes))
            {
                return (false, "有物料信息未录入，请录入物料信息", inboundOrderAddDTO);
            }

            if (BaseDal.QueryFirst(x => x.OrderName == inboundOrderAddDTO.orderName && !string.IsNullOrEmpty(x.OrderName)) != null)
            {
                return (false, "单据已存在", inboundOrderAddDTO);
            }
            return (true, "成功", inboundOrderAddDTO);
        }
        //    List<string> materielCodes = inboundOrderAddDTO.Details.Select(x => x.MaterielCode).ToList();
        //    if (!_basicService.MaterielInfoService.ExsitMateriels(materielCodes))
        //    {
        //        return (false, "有物料信息未录入，请录入物料信息", inboundOrderAddDTO);
        //    }
        //    Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == inboundOrderAddDTO.OutWareHouse);
        //    if (warehouse == null)
        //    {
        //        return (false, "未找到仓库信息", inboundOrderAddDTO);
        //    }
        //    if (BaseDal.QueryFirst(x => x.OrderName == inboundOrderAddDTO.orderName && !string.IsNullOrEmpty(x.OrderName)) != null)
        //    {
        //        return (false, "单据已存在", inboundOrderAddDTO);
        //    }
        //    return (true, "成功", inboundOrderAddDTO);
        //}


    }