2

schangxiang@126.com

2024-12-09 33c75f1b7dbc5ed934a91bea8eacd83dbb94b9a6

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs

@@ -9,6 +9,7 @@
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
using System.Collections.Generic;
using Admin.NET.Application.CommonHelper;

namespace Admin.NET.Application;
/// <summary>
@@ -26,6 +27,8 @@
    private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
    private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mesPackage_UnLine_RecordRep;
    private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;
    private readonly SqlSugarRepository<WmsRecordUpiReplenish> _wmsRecordUpiReplenishRep;
    private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;

    public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> wmsRbLineTaskRep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -34,8 +37,11 @@
        , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
        , SqlSugarRepository<Mes_Package_UnLine_Record> mesPackage_UnLine_RecordRep
        , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
        , SqlSugarRepository<WmsRecordUpiReplenish> wmsRecordUpiReplenishRep
        , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
        )
    {
        _wmsRecordUpiReplenishRep = wmsRecordUpiReplenishRep;
        _sysConfigRep = sysConfigRep;
        _mesPackageGatherRep = mesPackageGatherRep;
        _wmsRbLineTaskRep = wmsRbLineTaskRep;
@@ -44,6 +50,7 @@
        _mesOrderGatherRep = mesOrderGatherRep;
        _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
        _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
        _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
    }

    /// <summary>
@@ -310,7 +317,7 @@


    /// <summary>
    /// 不分页查询批次缺料清单 不齐包
    /// 人工补板动作
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
@@ -325,6 +332,45 @@
        {
            resJson = listRes.FirstOrDefault(u => u.UPI == input.UPI);
            //var filteredResult = listRes.FirstOrDefault(u => u.UPI == input.UPI);
        }
        var _cretaorName = App.User.FindFirst(ClaimConst.RealName)?.Value;
        if (resJson != null)
        {
            //执行人工补板动作
            var client = await WCFServiceHelper.GetWCFService_SAPCC_Client(_sysConfigRep);
            var res = await client.WriteStation_AllowInAsync();
            if (res.result == false)
            {
                throw Oops.Oh("补板工位允许进板请求失败:" + res.resMsg);
            }
            //*/

            //记录补板记录和板件履历
            var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.UPI).FirstAsync();
            if (singleUpi == null)
            {
                throw Oops.Oh($"没有找到部件条码{input.UPI}的数据");
            }
            WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
            wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
            wmsRecordUpi.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            wmsRecordUpi.CreateTime = DateTime.Now;
            wmsRecordUpi.CreateUserName = _cretaorName;
            wmsRecordUpi.Location = "";
            wmsRecordUpi.OperRemark = "人工补板";
            await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);

            WmsRecordUpiReplenish wmsRecordUpiNg = new WmsRecordUpiReplenish();
            wmsRecordUpiNg = singleUpi.Adapt<WmsRecordUpiReplenish>();
            wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            wmsRecordUpiNg.CreateTime = DateTime.Now;
            wmsRecordUpiNg.CreateUserName = _cretaorName;
            wmsRecordUpiNg.OperRemark = "人工补板";
            await _wmsRecordUpiReplenishRep.InsertAsync(wmsRecordUpiNg);
        }
        else
        {
            throw Oops.Oh($"板件'{input.UPI}'不在缺包清单中");
        }

        return resJson;
@@ -341,6 +387,11 @@
    public async Task<SqlSugarPagedList<WmsShortageListOutput>> ShortagePage(KittingListInput input)
    {
        var listRes = await GetShortageListCore(input);
        if (listRes?.Count > 0)
        {
            listRes = listRes.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5 == input.Info5).ToList();
            listRes = listRes.WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName == input.DetailName).ToList();
        }
        // 进行分页处理
        var totalCount = listRes.Count; // 获取总数
        var pagedList = listRes
@@ -570,5 +621,29 @@
        return groupedResult; // 返回分组结果
    }


    /// <summary>
    /// 查询包数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "QueryPackage")]
    [Description("WmsCommonnQuery/QueryPackage")]
    public async Task<Mes_Package_Gather> QueryPackage(QueryPackageInput input)
    {
        if (input == null || input.PackageCode == null)
        {
            throw Oops.Oh("参数不能为空");
        }

        var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
        if (package == null)
        {
            throw Oops.Oh($"没有找到包号{input.PackageCode}的汇总数据");
        }
        return package;
    }

}