版本更新

wangxinhui

2025-03-31 a6e0ea9ce13e791f3edae4edffeb3be3ccb760be

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/MesRworkOutboundOrderService.cs

@@ -1,4 +1,7 @@
using System;
using Newtonsoft.Json.Serialization;
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -6,16 +9,23 @@
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.MES;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
using WIDESEA_OutboundRepository;
using WIDESEA_Common.APIEnum;
using WIDESEA_Common.OrderEnum;

namespace WIDESEA_OutboundService
{
@@ -27,10 +37,14 @@
        private readonly IBasicService _basicService;
        private readonly IRecordService _recordService;
        private readonly IOutProStockInfoService _outProStockInfoService;
        private readonly IStockRepository _stockRepository;
        private readonly IOutProStockInfoRepository _outProStockInfoRepository;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly IApiInfoRepository _apiInfoRepository;

        public IMesRworkOutboundOrderRepository Repository => BaseDal;

        public MesRworkOutboundOrderService(IMesRworkOutboundOrderRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService, IOutProStockInfoService outProStockInfoService) : base(BaseDal)
        public MesRworkOutboundOrderService(IMesRworkOutboundOrderRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService, IOutProStockInfoService outProStockInfoService, IStockRepository stockRepository, IOutProStockInfoRepository outProStockInfoRepository,IUnitOfWorkManage unitOfWorkManage, IApiInfoRepository apiInfoRepository) : base(BaseDal)
        {
            _basicRepository = basicRepository;
            _stockService = stockService;
@@ -38,6 +52,10 @@
            _basicService = basicService;
            _recordService = recordService;
            _outProStockInfoService = outProStockInfoService;
            _stockRepository = stockRepository;
            _outProStockInfoRepository = outProStockInfoRepository;
            _unitOfWorkManage = unitOfWorkManage;
            _apiInfoRepository = apiInfoRepository;
        }
        /// <summary>
        /// æåº“任务分配库存
@@ -65,13 +83,15 @@
            float assignQuantity = needQuantity - residueQuantity;

            float orderQuantity = mesRworkOutboundOrder.RequiredQuantity;
            bool isCanDate = string.IsNullOrEmpty(mesRworkOutboundOrder.DateCode);
            for (int j = 0; j < autoAssignStocks.Count; j++)
            {
                //出库订单明细已分配数量
                float detailAssignQuantity = outProStockInfos
                    .Where(x => x.SaleOrder == mesRworkOutboundOrder.SaleOrder 
                    && x.PCode == mesRworkOutboundOrder.ProductCode 
                    && x.PVer == mesRworkOutboundOrder.ProductVersion)
                    && x.PVer == mesRworkOutboundOrder.ProductVersion
                    && (isCanDate ? isCanDate : x.DateCode == mesRworkOutboundOrder.DateCode))
                    .Sum(x => x.AssignQuantity);

                //出库详情已分配数量
@@ -79,7 +99,8 @@
                    .Where(x => x.SaleOrder == mesRworkOutboundOrder.SaleOrder 
                    && x.PCode == mesRworkOutboundOrder.ProductCode 
                    && x.PVer == mesRworkOutboundOrder.ProductVersion 
                    && x.PalletCode == autoAssignStocks[j].PalletCode)
                    && x.PalletCode == autoAssignStocks[j].PalletCode
                    && (isCanDate ? isCanDate : x.DateCode == mesRworkOutboundOrder.DateCode))
                    .Sum(x => x.AssignQuantity);

                float palletOutboundQuantity = autoAssignStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity);
@@ -103,7 +124,7 @@
            }
            locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(proStockInfos.Select(x => x.LocationCode).ToList()));

            return (proStockInfos, assignOutOrder, outProStockInfos, locationInfos);
            return (proStockInfos, mesRworkOutboundOrder, outProStockInfos, locationInfos);
        }
        public WebResponseContent LockOutboundStockDataUpdate(List<Dt_ProStockInfo> stockInfos, List<Dt_OutProStockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus = LocationStatusEnum.Lock, List<Dt_Task>? tasks = null)
        {
@@ -148,5 +169,185 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// æˆå“MES提库出库完后一包一包拣选
        /// </summary>
        /// <returns></returns>
        public WebResponseContent MesRworkOutPick(int OrderId,string InrPKCode,int Count=0)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                //获取当前的Mes提库单
                Dt_MesRworkOutboundOrder rworkOutboundOrder = BaseDal.QueryFirst(x => x.Id == OrderId);
                if (rworkOutboundOrder == null)
                {
                    return content.Error("未找到当前Mes提库单");
                }
                if (rworkOutboundOrder.OrderStatus>=OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    return content.Error("当前Mes提库单已完成或关闭");
                }
                //根据扫描内包号获取库存
                Dt_ProStockInfoDetail? proStockInfoDetail = _stockRepository.ProStockInfoDetailRepository.QueryFirst(x => x.BagNo == InrPKCode && x.ProOutDetailStatus == StockStatusEmun.出库完成.ObjToInt());
                if (proStockInfoDetail == null)
                {
                    return content.Error($"未找到内包{InrPKCode}信息");
                }
                //获取库存信息
                Dt_ProStockInfo? proStockInfo = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(x => x.Id == proStockInfoDetail.ProStockId).Includes(x => x.proStockInfoDetails).First();
                if (proStockInfo == null)
                {
                    return content.Error($"未找到内包{InrPKCode}库存信息");
                }
                //查询该托盘是否存在该单据的出库详情
                Dt_OutProStockInfo outProStockInfo = _outProStockInfoRepository.QueryFirst(x => x.OrderNo == rworkOutboundOrder.TaskNo && x.PalletCode == proStockInfo.PalletCode);
                if (outProStockInfo == null)
                {
                    return content.Error($"内包{InrPKCode}非单据{rworkOutboundOrder.TaskNo}内容");
                }
                //判断是否整包数量
                if (Count > 0)
                {
                    if (Count> proStockInfoDetail.StockPcsQty)
                    {
                        return content.Error($"内包数量{(int)proStockInfoDetail.StockPcsQty}<出库数量{Count}");
                    }
                    int setinterval = (int)proStockInfoDetail.StockPcsQty / (int)proStockInfoDetail.SETQty;
                    if (Count % setinterval!=0)
                    {
                        return content.Error($"获取SET数量失败,1SET:{setinterval}PCS");
                    }
                    proStockInfoDetail.OutSETQty = Count / setinterval;
                    proStockInfoDetail.OutboundQuantity = Count;
                }
                else
                {
                    proStockInfoDetail.OutSETQty = proStockInfoDetail.SETQty;
                    proStockInfoDetail.OutboundQuantity = proStockInfoDetail.StockPcsQty;
                }
                rworkOutboundOrder.OverOutQuantity += proStockInfoDetail.OutboundQuantity;
                if (rworkOutboundOrder.OverOutQuantity> rworkOutboundOrder.RequiredQuantity)
                {
                    return content.Error($"单据{rworkOutboundOrder.TaskNo}溢出{rworkOutboundOrder.OverOutQuantity - rworkOutboundOrder.RequiredQuantity}");
                }
                if (rworkOutboundOrder.OverOutQuantity== rworkOutboundOrder.RequiredQuantity)
                {
                    rworkOutboundOrder.OrderStatus = OutOrderStatusEnum.出库完成.ObjToInt();
                }

                int SetCount = (int)proStockInfoDetail.OutSETQty;
                int EligiblePcsCount = (int)proStockInfoDetail.OutboundQuantity;
                _unitOfWorkManage.BeginTran();
                if (proStockInfoDetail.SETQty == proStockInfoDetail.OutSETQty && proStockInfoDetail.StockPcsQty== proStockInfoDetail.OutboundQuantity)
                {
                    proStockInfo.proStockInfoDetails.Remove(proStockInfoDetail);
                    if (proStockInfo.proStockInfoDetails.Count==0)
                    {
                        _stockRepository.ProStockInfoRepository.DeleteAndMoveIntoHty(proStockInfo, OperateTypeEnum.自动完成);
                    }
                    _stockRepository.ProStockInfoDetailRepository.DeleteAndMoveIntoHty(proStockInfoDetail, OperateTypeEnum.自动完成);
                }
                else
                {
                    proStockInfoDetail.SETQty -= proStockInfoDetail.OutSETQty;
                    proStockInfoDetail.StockPcsQty -= proStockInfoDetail.OutboundQuantity;
                    proStockInfoDetail.OutSETQty = 0;
                    proStockInfoDetail.OutboundQuantity = 0;
                    _stockRepository.ProStockInfoDetailRepository.UpdateData(proStockInfoDetail);
                }
                BaseDal.UpdateData(rworkOutboundOrder);
                //MES成品库存板出库同步
                WebResponseContent responseContent = ProductOutBoundSync(MesProOutBound(rworkOutboundOrder, new List<Dt_ProStockInfoDetail> { proStockInfoDetail }, SetCount, EligiblePcsCount));
                if (responseContent.Status)
                {
                    throw new Exception("同步MES库存板出库失败,错误:" + responseContent.Message);
                }
                _unitOfWorkManage.CommitTran();
                if (rworkOutboundOrder.OrderStatus==OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    content.OK($"单号{rworkOutboundOrder.TaskNo}已完成");
                }
                else
                {
                    content.OK($"单号{rworkOutboundOrder.TaskNo},剩余:{rworkOutboundOrder.RequiredQuantity-rworkOutboundOrder.OverOutQuantity}PCS");
                }
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// åº“存板数据转换
        /// </summary>
        /// <returns></returns>
        public MesProductOutBound MesProOutBound(Dt_MesRworkOutboundOrder mesRworkOutboundOrder, List<Dt_ProStockInfoDetail> proStockInfoDetails,int SetCount,int EligiblePcsCount)
        {
            //获取仓库信息
            Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == mesRworkOutboundOrder.WarehouseId);
            List<MesInventoryInfo> inventoryInfos = new List<MesInventoryInfo>();
            foreach (var item in proStockInfoDetails)
            {
                MesInventoryInfo mesInventoryInfo = new MesInventoryInfo()
                {
                    Warhouseno = warehouse.WarehouseCode,
                    InternalPackageNumber = item.BagNo,
                    SetCount = SetCount,
                    EligiblePcsCount = EligiblePcsCount
                };
                inventoryInfos.Add(mesInventoryInfo);
            }
            MesProductOutBound mesProductOutBound = new MesProductOutBound()
            {
                TaskNo = mesRworkOutboundOrder.TaskNo,
                ProductCode = mesRworkOutboundOrder.ProductCode,
                ProductVersion = mesRworkOutboundOrder.ProductVersion,
                DateCode = mesRworkOutboundOrder.DateCode,
                SaleOrder = mesRworkOutboundOrder.SaleOrder,
                InventoryInfo = inventoryInfos
            };
            return mesProductOutBound;
        }
        /// <summary>
        /// æˆå“åº“存板同步接口
        /// </summary>
        public WebResponseContent ProductOutBoundSync(MesProductOutBound model)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_ProductOutBound.ToString());
                MESRoot<MesProductOutBound> root = new MESRoot<MesProductOutBound>()
                {
                    From = "WMS",
                    DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Content = model
                };
                JsonSerializerSettings settings = new JsonSerializerSettings
                {
                    ContractResolver = new CamelCasePropertyNamesContractResolver()
                };
                string request = JsonConvert.SerializeObject(root, settings);
                string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
                MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
                //调用接口
                if (mesResponseContent.BSucc == true)
                {
                    content.OK(mesResponseContent.StrMsg);
                }
                else
                {
                    content.Error(mesResponseContent.StrMsg);
                }
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
    }
}