ERP接口代码更新，WCS代码优化，出入库分配优化

wangxinhui

4 天以前 a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_OutboundService/OutBSTOrderService.cs

@@ -5,12 +5,13 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -24,100 +25,14 @@
        private readonly IBasicRepository _basicRepository;
        private readonly IMapper _mapper;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly IOutBSTOrderDetailRepository _outBSTOrderDetailRepository;

        public OutBSTOrderService(IOutBSTOrderRepository BaseDal,IBasicRepository basicRepository,IMapper mapper,IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
        public OutBSTOrderService(IOutBSTOrderRepository BaseDal,IBasicRepository basicRepository,IMapper mapper,IUnitOfWorkManage unitOfWorkManage,IOutBSTOrderDetailRepository outBSTOrderDetailRepository) : base(BaseDal)
        {
            _basicRepository = basicRepository;
            _mapper = mapper;
            _unitOfWorkManage = unitOfWorkManage;
        }
        /// <summary>
        /// æ·»åŠ å‡ºåº“排程信息
        /// </summary>
        public WebResponseContent AddOutBSTOrder(List<BSTOutOrderDTO> bSTOutOrderDTOs)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                //获取所有出库单
                List<Dt_OutBSTOrder> OldoutBSTOrders = BaseDal.Db.Queryable<Dt_OutBSTOrder>().Includes(x => x.Details).ToList();
                //新增
                List<BSTOutOrderDTO> outOrderDTOsAdd = bSTOutOrderDTOs.Where(x => x.Way == 1).ToList();
                //修改
                List<BSTOutOrderDTO> outOrderDTOsUpdate = bSTOutOrderDTOs.Where(x => x.Way == 2).ToList();
                //删除
                List<BSTOutOrderDTO> outOrderDTOsDel = bSTOutOrderDTOs.Where(x => x.Way == 3).ToList();
                //获取所有物料 
                List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.老厂.ObjToInt() && x.MaterialSourceId != 0);

                List<Dt_OutBSTOrder> outBSTAddOrders = new List<Dt_OutBSTOrder>();
                List<Dt_OutBSTOrder> outBSTUpOrders = new List<Dt_OutBSTOrder>();
                List<Dt_OutBSTOrder> outBSTDelOrders = new List<Dt_OutBSTOrder>();
                //新增
                if (outOrderDTOsAdd.Count>0)
                {
                    //判断单据
                    Dt_OutBSTOrder? ExistAddOutOrder = OldoutBSTOrders.FirstOrDefault(x => outOrderDTOsAdd.Select(x => x.BoardMpsId).Contains(x.BoardMpsId));
                    if (ExistAddOutOrder != null)
                    {
                        return content.Error($"出库排程Id{nameof(BSTOutOrderDTO.BoardMpsId)}:{ExistAddOutOrder.BoardMpsId}已存在");
                    }
                    List<BstBoardMpsDetailItem> bstBoardMpsDetailItems = outOrderDTOsAdd.SelectMany(x => x.BstBoardMpsDetails).ToList();
                    //判断是否存在物料
                    BstBoardMpsDetailItem? bstBoardMpsDetailItem = bstBoardMpsDetailItems.FirstOrDefault(x => !materielInfos.Select(x => x.MaterialSourceId).Contains(x.MaterialId));
                    if (bstBoardMpsDetailItem != null)
                    {
                        return content.Error($"生产排程{nameof(bstBoardMpsDetailItem.BoardMpsId)}物料Id:{bstBoardMpsDetailItem.MaterialId}不存在");
                    }
                    foreach (var item in outOrderDTOsAdd)
                    {
                        List<Dt_OutBSTOrderDetail> bSTOrderDetails = item.BstBoardMpsDetails.Select(x => _mapper.Map<Dt_OutBSTOrderDetail>(x)).ToList();
                        Dt_OutBSTOrder outBSTOrder = _mapper.Map<Dt_OutBSTOrder>(item);
                        outBSTOrder.Details=bSTOrderDetails;
                        outBSTAddOrders.Add(outBSTOrder);
                    }
                }
                //修改
                if (outOrderDTOsUpdate.Count > 0)
                {
                    List<Dt_OutBSTOrder>? ExistUpdateoutBSTOrders = OldoutBSTOrders.Where(x => outOrderDTOsUpdate.Select(x => x.BoardMpsId).Contains(x.BoardMpsId)).ToList();
                    //更新的单据是否存在
                    if (ExistUpdateoutBSTOrders.Count == outOrderDTOsUpdate.Count)
                    {

                    }
                    else
                    {
                        BSTOutOrderDTO? bSTOutOrderDTO = outOrderDTOsUpdate.FirstOrDefault(x => !ExistUpdateoutBSTOrders.Select(x => x.BoardMpsId).Contains(x.BoardMpsId));
                        return content.Error($"未找到指定生产排程单Id{nameof(BSTOutOrderDTO.BoardMpsId)}:{bSTOutOrderDTO?.BoardMpsId}");
                    }
                }
                //删除
                if (outOrderDTOsDel.Count > 0)
                {
                    List<Dt_OutBSTOrder>? ExistDeloutBSTOrders = OldoutBSTOrders.Where(x => outOrderDTOsDel.Select(x => x.BoardMpsId).Contains(x.BoardMpsId)).ToList();
                    //更新的单据是否存在
                    if (ExistDeloutBSTOrders.Count == outOrderDTOsDel.Count)
                    {

                    }
                    else
                    {
                        BSTOutOrderDTO? bSTOutOrderDTO = outOrderDTOsDel.FirstOrDefault(x => !ExistDeloutBSTOrders.Select(x => x.BoardMpsId).Contains(x.BoardMpsId));
                        return content.Error($"未找到指定生产排程单Id{nameof(BSTOutOrderDTO.BoardMpsId)}:{bSTOutOrderDTO?.BoardMpsId}");
                    }
                }
                _unitOfWorkManage.BeginTran();
                BaseDal.Db.InsertNav(outBSTAddOrders).Include(x => x.Details).ExecuteCommand();
                _unitOfWorkManage.CommitTran();
                content.OK("接收成功");
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
            _outBSTOrderDetailRepository = outBSTOrderDetailRepository;
        }
    }
}