出库执行 哟花

schangxiang@126.com

2024-08-28 39c09dede499f7ba23bcd26b17b2199a31bddccc

 iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs

@@ -9,6 +9,7 @@
using Furion.DynamicApiController;
using System.Text;
using iWare.Wms.Core.Enum;
using Microsoft.AspNetCore.Authorization;

namespace iWare.Wms.Application.Service.Pda
{
@@ -18,6 +19,7 @@
    //[Route("api")]
    [ApiDescriptionSettings("Pda相关接口", Name = "PdaService", Order = 100)]
    [Route("api/[Controller]")]
    [DisableOpLog]
    public class PdaService : IDynamicApiController, ITransient
    {
        private readonly IRepository<EquipmentBaseInfo, MasterDbContextLocator> _equipmentBaseInfoRep;
@@ -30,12 +32,14 @@
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<WorkPieceInfoLog, MasterDbContextLocator> _workPieceInfoLogRep;
        private readonly IRepository<WorkPieceOutbound, MasterDbContextLocator> _workPieceOutboundRep;
        private readonly IRepository<WorkPieceUnLine, MasterDbContextLocator> _workPieceUnLineRep;

        /// <summary>
        /// 设备基础信息构造函数
        /// </summary>
        /// <param name="equipmentBaseInfoRep"></param>
        public PdaService(
            IRepository<WorkPieceUnLine, MasterDbContextLocator> workPieceUnLineRep,
            IRepository<EquipmentBaseInfo, MasterDbContextLocator> equipmentBaseInfoRep,
            IRepository<V_GetEquipmentAlert, MasterDbContextLocator> v_GetEquipmentAlert,
            IRepository<EquipmentCurrentMonitor, MasterDbContextLocator> equipmentCurrentMonitorRep,
@@ -48,6 +52,7 @@
            IRepository<WorkPieceOutbound, MasterDbContextLocator> workPieceOutboundRep
            )
        {
            _workPieceUnLineRep = workPieceUnLineRep;
            _equipmentBaseInfoRep = equipmentBaseInfoRep;
            _v_GetEquipmentAlertRep = v_GetEquipmentAlert;
            _equipmentCurrentMonitorRep = equipmentCurrentMonitorRep;
@@ -66,7 +71,7 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet("getOneWorkPiece")]
        public async Task<WorkPieceInfoOutput> getOneWorkPiece([FromQuery] WorkPieceProcessPdaSearch input) 
        public async Task<WorkPieceInfoOutput> getOneWorkPiece([FromQuery] WorkPieceProcessPdaSearch input)
        {
            if (string.IsNullOrEmpty(input.WorkPieceID))
            {
@@ -97,8 +102,8 @@
                   WorkPieceCurrentPosition = s.c.a.WorkPieceCurrentPosition,
                   WorkPieceinitOnlineTime = s.c.a.WorkPieceinitOnlineTime,
                   WorkPieceLastOfflineTime = s.c.a.WorkPieceLastOfflineTime,
                   WorkingProcedureCompleted= s.c.a.WorkingProcedureCompleted,
                   OP80NewCode=s.c.a.OP80NewCode,
                   WorkingProcedureCompleted = s.c.a.WorkingProcedureCompleted,
                   OP80NewCode = s.c.a.OP80NewCode,
               })
               .ProjectToType<WorkPieceInfoOutput>().FirstOrDefaultAsync();
            if (workPieceInfo == null)
@@ -122,7 +127,7 @@
                // //.Where(x => (x.g.Code.Equals("equipment_state")))
                .Where(u => u.a.QualityState != (int)EnumQualityState.OK)
                  .Where(u => u.a.IsDeleted == false)
                  .Where(o => o.a.WorkPieceID.Contains(queryStr ?? "")|| o.a.QualityErrorInfo.Contains(queryStr ?? ""))
                  .Where(o => o.a.WorkPieceID.Contains(queryStr ?? "") || o.a.QualityErrorInfo.Contains(queryStr ?? ""))
                 //.Where(o => (o.a.QualityStateUpdateTime.HasValue ? o.a.QualityStateUpdateTime.Value : DateTime.MinValue) > DateTime.Now.AddDays(-7))
                 .Where(o => !string.IsNullOrEmpty(o.a.WorkPieceID))
                 .Select(s => new WorkPieceInfoOutput
@@ -137,8 +142,8 @@
                     WorkingProcedureCompleted = s.a.WorkingProcedureCompleted,
                     WorkPieceinitOnlineTime = s.a.WorkPieceinitOnlineTime,
                     QualityState = s.a.QualityState,
                     QualityErrorInfo= s.a.QualityErrorInfo,
                     QualityStateUpdateTime=(s.a.QualityStateUpdateTime.HasValue? s.a.QualityStateUpdateTime.Value:DateTime.MinValue),
                     QualityErrorInfo = s.a.QualityErrorInfo,
                     QualityStateUpdateTime = (s.a.QualityStateUpdateTime.HasValue ? s.a.QualityStateUpdateTime.Value : DateTime.MinValue),
                     EquipmentID = s.a.EquipmentID,
                     EquipmentName = s.b.EquipmentName,
                     //EquipmentCurrentState = s.d.EquipmentCurrentState,
@@ -221,6 +226,7 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("getWorkPieceProcess")]
        [DisableOpLog]
        public async Task<WorkPieceProcessPdaOutput> getWorkPieceProcess([FromQuery] WorkPieceProcessPdaSearch input)
        {
            var workPieceProcesss = await _workPieceProcessRep.DetachedEntities
@@ -287,7 +293,7 @@
                    throw Oops.Oh($"修改工件质量状态失败：工件{item}不存在！");
                }

                if(int.Parse(input.QualityState)==(int)EnumQualityState.OK)
                if (int.Parse(input.QualityState) == (int)EnumQualityState.OK)
                {
                    workPieceInfo.QualityErrorInfo = "";
                }
@@ -321,7 +327,7 @@
        [HttpPost("updateWorkPieceInfo")]
        public async Task<string> updateWorkPieceInfo([FromBody] UpdateQualityStateInput input)
        {
            if (input == null || input.WorkPieceIDList.Count == 0  || input.Password == null)
            if (input == null || input.WorkPieceIDList.Count == 0 || input.Password == null)
            {
                throw Oops.Oh("修改工件信息失败：传参不能为空！");
            }
@@ -341,7 +347,7 @@
            {
                throw Oops.Oh($"修改工件信息失败：传入工件状态[{input.WorkPieceState}]不对！");
            }
            if (input.WorkingProcedure.Length!=4|| !input.WorkingProcedure.Contains("OP"))
            if (input.WorkingProcedure.Length != 4 || !input.WorkingProcedure.Contains("OP"))
            {
                throw Oops.Oh($"修改工件信息失败：传入工序[{input.WorkingProcedure}]不对！");
            }
@@ -358,7 +364,7 @@
                    throw Oops.Oh($"修改工件质量状态失败：工件{item}不存在！");
                }
                string LogAddRemark = "";
                if (workPieceInfo.QualityState!= int.Parse(input.QualityState))
                if (workPieceInfo.QualityState != int.Parse(input.QualityState))
                {
                    LogAddRemark += $"质量信息[{workPieceInfo.QualityState ?? 0}]到[{input.QualityState}]";
                    workPieceInfo.QualityState = int.Parse(input.QualityState);
@@ -383,7 +389,7 @@
                {
                    LogAddRemark += $"工件状态 [{workPieceInfo.WorkPieceState}]到[{input.WorkPieceState}]";
                    workPieceInfo.WorkPieceState = int.Parse(input.WorkPieceState);
                    if(workPieceInfo.WorkPieceState==(int)EnumWorkPieceState.FinishedProducts)
                    if (workPieceInfo.WorkPieceState == (int)EnumWorkPieceState.FinishedProducts)
                    {
                        workPieceInfo.WorkPieceLastOfflineTime = DateTime.Now;
                    }
@@ -411,16 +417,22 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet("getWorkPieceByOP80NewCode")]
        [DisableOpLog]
        [AllowAnonymous]
        public async Task<WorkPieceInfoOutput> getWorkPieceByOP80NewCode([FromQuery] WorkPieceByOP80NewCodeInputSearch input)
        {

            if (string.IsNullOrEmpty(input.OP80NewCode))
            {
                throw Oops.Oh($"请输入OP80打印成品码或二维码！");
                throw Oops.Oh($"请输入成品码或工件码！");
            }
            if (input.OP80NewCode.Length > 22)
            {
                throw Oops.Oh($"工件码或成品码{input.OP80NewCode}长度不正确！");
            }
            string OP80NewCode = input.OP80NewCode.Trim();
            var workPieceInfo = await _workPieceInfoRep.DetachedEntities
               .Where(!string.IsNullOrEmpty(OP80NewCode), u => u.OP80NewCode == OP80NewCode||u.WorkPieceID== OP80NewCode)
               .Where(!string.IsNullOrEmpty(OP80NewCode), u => u.OP80NewCode == OP80NewCode || u.WorkPieceID == OP80NewCode)
               .Select(s => new WorkPieceInfoOutput
               {
                   Id = s.Id,
@@ -440,8 +452,23 @@
               }).FirstOrDefaultAsync();
            if (workPieceInfo == null)
            {
                throw Oops.Oh($"OP80打印成品码或工件二维码【{OP80NewCode}】没有找到相关工件信息！");
                //throw Oops.Oh($"OP80打印成品码或工件二维码【{OP80NewCode}】没有找到相关工件信息！");
                workPieceInfo = new WorkPieceInfoOutput
                {
                    WorkPieceID = OP80NewCode,
                    OP80NewCode = OP80NewCode,
                };
            }

            //判断是否已经出库
            List<WorkPieceOutbound> db_itemModelList = await _workPieceOutboundRep.DetachedEntities.Where(w => (w.WorkPieceID == OP80NewCode || w.OP80NewCode == OP80NewCode) && w.IsDeleted == false).ToListAsync();
            if (db_itemModelList != null && db_itemModelList.Count > 0)
            {
                var itemModel = db_itemModelList.First();
                var createitme = itemModel.CreatedTime == null ? "" : (((DateTimeOffset)itemModel.CreatedTime).UtcDateTime.ToString("yyyy-MM-dd HH:mm:ss"));
                throw Oops.Oh($"工件{itemModel.WorkPieceID}已出库，出库时间:{createitme}");
            }

            return workPieceInfo;
        }

@@ -451,6 +478,8 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("outBoundWorkPiece")]
        [DisableOpLog]
        [UnitOfWork]
        public async Task<string> outBoundWorkPiece([FromBody] OutBoundInput input)
        {

@@ -463,21 +492,39 @@
                throw Oops.Oh("工件出库失败：数据不能为空！");
            }

            List<WorkPieceInfoOutput> WorkPieceInfoLst = input.WorkPieceInfoLst;
            List<OutBoundDetailsInput> WorkPieceInfoLst = input.WorkPieceInfoLst;

            var addOutBoundList = new List<WorkPieceOutbound>();

            var queryOP80NewCodeList = WorkPieceInfoLst.Select(x => x.OP80NewCode).ToList();
            List<WorkPieceOutbound> db_itemModelList = await _workPieceOutboundRep.Where(w => queryOP80NewCodeList.Contains(w.OP80NewCode) && w.IsDeleted == false).ToListAsync();

            List<WorkPieceInfo> db_WorkPieceInfoList = await _workPieceInfoRep.Where(w => queryOP80NewCodeList.Contains(w.OP80NewCode) && w.IsDeleted == false).ToListAsync();

            foreach (var item in WorkPieceInfoLst)
            {
                WorkPieceOutbound itemModel=await _workPieceOutboundRep.FirstOrDefaultAsync(w=>w.WorkPieceID==item.WorkPieceID);
                if (itemModel != null) {
                    itemModel.IsDeleted = true;
                    itemModel.Remark = itemModel.Remark ?? "" + "二次发货自动撤销发货";
                    await _workPieceOutboundRep.UpdateAsync(itemModel);
                var itemModel = db_itemModelList.FirstOrDefault(w => w.OP80NewCode == item.OP80NewCode);
                if (itemModel != null)
                {
                    //itemModel.IsDeleted = true;
                    //itemModel.Remark = itemModel.Remark ?? "" + "二次发货自动撤销发货";
                    //await _workPieceOutboundRep.UpdateAsync(itemModel);
                    var createitme = itemModel.CreatedTime == null ? "" : (((DateTimeOffset)itemModel.CreatedTime).UtcDateTime.ToString("yyyy-MM-dd HH:mm:ss"));
                    throw Oops.Oh($"成品码{itemModel.OP80NewCode}已出库，出库时间:{createitme}");
                }
                var workPiece = db_WorkPieceInfoList.FirstOrDefault(w => w.OP80NewCode == item.OP80NewCode);
                if (workPiece != null)
                {
                    workPiece.OutPerson = CurrentUserInfo.Name;
                    workPiece.OutRemark = "撤销工件出库";
                    workPiece.OutTime = DateTime.Now;
                    workPiece.IsOut = false;

                    await _workPieceInfoRep.UpdateAsync(workPiece);
                }
                var outBoundLog = new WorkPieceOutbound
                {
                    WorkPieceID = item.WorkPieceID,
                    WorkPieceID = workPiece?.WorkPieceID,
                    OP80NewCode = item.OP80NewCode,
                    WorkPieceOutboundTime = DateTime.Now,
                    WorkPieceOutboundUserId = CurrentUserInfo.UserId,
@@ -486,10 +533,37 @@
                    CreatedUserName = CurrentUserInfo.Name,
                };
                addOutBoundList.Add(outBoundLog);


            }
            await _workPieceOutboundRep.InsertAsync(addOutBoundList);
            return "出库成功";
        }

        /// <summary>
        /// 出库统计
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("getOutBoundWorkPieceInfoCount")]
        [DisableOpLog]
        public async Task<string> GetOutBoundWorkPieceInfoCount()
        {
            DateTimeOffset now = DateTimeOffset.Now; // 获取当前时间，包括时区偏移量
            DateTimeOffset startOfDay = new DateTimeOffset(now.Year, now.Month, now.Day, 0, 0, 0, now.Offset); // 当天开始时间
            DateTimeOffset endOfDay = new DateTimeOffset(now.Year, now.Month, now.Day, 23, 59, 59, now.Offset); // 当天结束时间
            List<WorkPieceOutbound> db_itemModelList = await _workPieceOutboundRep.Where(w => w.CreatedTime >= startOfDay && w.CreatedTime <= endOfDay && w.IsDeleted == false).ToListAsync();

            return db_itemModelList.Count().ToString();
        }


        #region 新版 下线、出库执行




        #endregion

    }
}