纸张淋膜半成品入库逻辑优化

wangxinhui

2026-03-26 5c272c606bdf2da3577dbaa5f48d0ee163f1e7d2

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs

@@ -15,6 +15,7 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IPackInfoRepository;
using WIDESEAWCS_ITaskInfoRepository;
@@ -59,12 +60,14 @@
                    {
                        return content.Error($"未找到条码{barCode}");
                    }
                    List<Dt_StationPackInfo> stationPackInfos = _stationPackInfoRepository.QueryData();
                    List<Dt_StationPackInfo> stationPackInfos = _stationPackInfoRepository.Db.Queryable<Dt_StationPackInfo>().ToList();
                    Dt_StationPackInfo? stationPackInfo = stationPackInfos.FirstOrDefault(x => x.PackType == packinfo.PackType && x.OrderNo == packinfo.OrderNo && x.AssignNum < x.PackNum);
                    Dt_PackaxisTask packaxisTask = new Dt_PackaxisTask();
                    //如果订单相同、垛型一致并且分配数量少于码垛结托数量则分配到一起
                    _unitOfWorkManage.BeginTran();
                    if (stationPackInfo != null)
                    {
                        Dt_PackaxisTask packaxisTask = new Dt_PackaxisTask()
                        packaxisTask = new Dt_PackaxisTask()
                        {
                            DeviceCode = deviceCode,
                            SourceAddress = "2421",
@@ -82,22 +85,21 @@
                        stationPackInfo.AssignNum += 1;
                        stationPackInfo.ExecutingNum += 1;
                        packinfo.PackStatus = StationOccupiedEnum.Sure.ObjToInt();
                        _unitOfWorkManage.BeginTran();
                        
                        //更新码垛执行工位
                        _stationPackInfoRepository.UpdateData(stationPackInfo);
                        //更新待码垛信息表
                        _packinfoRepository.UpdateData(packinfo);
                        //添加码垛任务
                        BaseDal.AddData(packaxisTask);
                        _unitOfWorkManage.CommitTran();
                        return content.OK(barCode, packaxisTask);
                        
                    }
                    else//分配新工位
                    {
                        //获取当前空盘准备的码垛工位
                        List<string> stations = _stationMangerRepository.QueryData(x => x.StationDeviceCode == "CLC_CP" && x.IsOccupied == StationOccupiedEnum.None.ObjToInt()).Select(x => x.StationCode).ToList();
                        //获取码垛配置表查询可分配并已配置的码垛工位
                        List<Dt_Packaxis> packaxes = _packaxisRepository.QueryData(x => x.PackType == packinfo.PackType && stations.Contains(x.StationCode));
                        List<Dt_Packaxis> packaxes = _packaxisRepository.Db.Queryable<Dt_Packaxis>().Where(x => x.PackType == packinfo.PackType && stations.Contains(x.StationCode)).ToList();
                        if (packaxes.Count == 0)
                        {
                            return content.Error("未找到可分配码垛配置");
@@ -113,7 +115,7 @@
                        packInfoAssign.MakeCode = packinfo.MakeCode;
                        packInfoAssign.MaterielCode = packInfoAssign.MaterielCode;
                        packInfoAssign.PackNum = packaxes.FirstOrDefault(x => x.StationCode == packInfoAssign.StationCode).PackNum;
                        Dt_PackaxisTask packaxisTask = new Dt_PackaxisTask()
                        packaxisTask = new Dt_PackaxisTask()
                        {
                            DeviceCode = deviceCode,
                            SourceAddress = "2421",
@@ -131,16 +133,15 @@
                        packInfoAssign.AssignNum += 1;
                        packInfoAssign.ExecutingNum += 1;
                        packinfo.PackStatus = StationOccupiedEnum.Sure.ObjToInt();
                        _unitOfWorkManage.BeginTran();
                        //更新码垛执行工位
                        _stationPackInfoRepository.UpdateData(packInfoAssign);
                        //更新待码垛信息表
                        _packinfoRepository.UpdateData(packinfo);
                        //添加码垛任务
                        BaseDal.AddData(packaxisTask);
                        _unitOfWorkManage.CommitTran();
                        return content.OK(barCode, packaxisTask);
                    }
                    _unitOfWorkManage.CommitTran();
                    return content.OK(barCode, packaxisTask);
                }
                catch (Exception ex)
                {
@@ -251,6 +252,37 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// åˆ é™¤ç åž›ä»»åŠ¡ä¿¡æ¯
        /// </summary>
        /// <param name="packTaskNum"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent PickaixsTaskDele(int PackTaskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                    Dt_PackaxisTask packaxisTask = BaseDal.QueryFirst(x => x.PackTaskNum == PackTaskNum);
                    if(packaxisTask == null)
                    {
                        return WebResponseContent.Instance.Error("未找到任务");
                    }
                    else 
                    {
                        Dt_Packinfo packinfo = _packinfoRepository.QueryFirst(x => x.BarCode == packaxisTask.BarCode);
                        packinfo.PackStatus = 0;
                        _packinfoRepository.UpdateData(packinfo);
                        BaseDal.DeleteAndMoveIntoHty(packaxisTask, App.User?.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工删除);
                      content.Status = true;
                    }
            }
            catch (Exception e)
            {
                return WebResponseContent.Instance.Error(e.Message);
            }
            return content;
        }
    }
    public class MDCount
    {