1

wankeda

2 天以前 786c5ca17012ff3a01faf466b751bdbe70629b97

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -68,7 +68,7 @@
                // å®šä¹‰çº¿ä½“实盘入库请求的地址和任务类型
                var requests = new Dictionary<string, string>
                {
                    { "DB1002.1493.0", "ZJXL-WLX002" },
                    { "DB1002.693.0", "ZJXL-WLX002" },
                    { "DB1002.1093.0", "FJXL-WLX002" }
                };

@@ -148,21 +148,21 @@
                }

                string fromAdd = request.Value;
                string taskType = "负极"; //request.Value.Contains("ZJXL") ? "正极" :
                string taskType = request.Value.Contains("ZJXL") ? "正极" : "负极"; //request.Value.Contains("ZJXL") ? "正极" :

                // æ ¹æ®ä»»åŠ¡ç±»åž‹ç¡®å®šè¯·æ±‚地址
                (string upRequest, string gmRequest, string gmState) = GetRequestAddresses(taskType);

                var isUpRequest = conveyorLine.Communicator.Read<bool>(upRequest);
                var isGMRequest = conveyorLine.Communicator.Read<bool>(gmRequest);
                var isGMState = conveyorLine.Communicator.Read<int>(gmState);
                var isGMRequest = conveyorLine.Communicator.Read<bool>(gmRequest);//暂存线请求
                var isGMState = conveyorLine.Communicator.Read<int>(gmState);//暂存线出入库类型切换

                // æ ¹æ®æ¡ä»¶åˆ›å»ºä»»åŠ¡å¯¹è±¡
                Dt_Task task = null;
                if (isUpRequest)
                {
                    List<Dt_Task> dt_Task = _taskRepository.QueryData(x => x.SourceAddress == fromAdd && x.TaskState == (int)TaskInStatusEnum.InPending);
                    if (dt_Task.Count < 0) { continue; }
                    if (dt_Task.Count <= 0) { continue; }
                    var tasks = dt_Task.Where(x => x.SourceAddress == fromAdd).OrderBy(t => t.CreateDate).First();
                    tasks.TaskState = (int)TaskInStatusEnum.InNew;
                    _taskService.UpdateData(tasks);
@@ -199,21 +199,24 @@
        {
            if (targetAddress != "WaitBind")
            {
                var details = _detailsRepository.QueryData(x => x.TaskEndAddress == targetAddress).ToList();
                var details = _detailsRepository.QueryData(x => x.TaskEndAddress == targetAddress).OrderBy(x => x.CreateDate).Take(2).ToList();
                foreach (var item in details)
                {
                    var taskCZ = _taskCZRepository.QueryFirst(x => x.TaskTaskID == item.TaskTaskID);
                    if (taskCZ.TaskType.Contains("正极"))
                    {
                        taskCZ.TaskZJFinishNumber += 1;
                        _detailsRepository.DeleteData(item);
                    }
                    else
                    {
                        taskCZ.TaskFJFinishNumber += 1;
                        _detailsRepository.DeleteData(item);
                    }
                    if (taskCZ.TaskZJFinishNumber == taskCZ.TaskNumber || taskCZ.TaskFJFinishNumber == taskCZ.TaskNumber)
                    {
                        _taskCZRepository.DeleteData(taskCZ);

                    }

                    var isTrue = _taskCZRepository.UpdateData(taskCZ);
@@ -224,6 +227,15 @@
            {
                return null;
            }
            int type = 0;
            if (targetAddress.Contains("ZC"))
            {
                type = 2;
            }
            else
            {
                type = 1;
            }
            return new Dt_Task
            {
                TaskNum = _taskService.GetTaskNum(),
@@ -232,15 +244,16 @@
                CurrentAddress = currentAddress,
                SourceAddress = currentAddress,
                TaskState = targetAddress != "WaitBind" ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.InPending,
                TaskType = (int)TaskOutboundTypeEnum.Outbound,
                TaskType = type,
                Grade = 1,
                PalletCode = palletCode,
                TargetAddress = targetAddress,
                NextAddress = targetAddress,
                Barcode = "",
                Roadway = $"{taskType}AGV",
                Roadway = "AGV",
                WMSId = czTaskID > 0 ? czTaskID : 0,
                Remark = remark
                Remark = remark,
                Floor = 3
            };
        }