From 0b5ccdca6263cf7a2cee460f30c76ef1efea2811 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 27 四月 2024 17:47:27 +0800
Subject: [PATCH] 人工出库，人工入库，人工移库，PDA扫码确认外协物料已被取走接口
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs | 554 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 363 insertions(+), 191 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
index f78df0c..ae19956 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
@@ -1,4 +1,5 @@
锘縰sing FreeSql.Internal.Model;
+using Newtonsoft.Json;
using StackExchange.Redis;
using System;
using System.Collections.Generic;
@@ -11,6 +12,7 @@
using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.TaskNo;
using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.FreeDB;
using WIDESEA_Entity.DomainModels;
using WIDESEA_WCS.IRepositories;
using WIDESEA_WCS.JobsPart.Common;
@@ -37,6 +39,7 @@
VOLContext Context = new VOLContext();
Idt_plcinfoheadRepository repository = new dt_plcinfoheadRepository(Context);
Idt_plcinfodetailRepository plcRepository = new dt_plcinfodetailRepository(Context);
+ IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);
Idt_geometry_dataRepository dataRepository = new dt_geometry_dataRepository(Context);
Idt_mes_detailRepository mes_DetailRepository = new dt_mes_detailRepository(Context);
Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
@@ -56,32 +59,47 @@
if (name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ杞﹁疆") number = "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟";
if (name == "杈婇亾涓婃枡鏌ヨ杞﹁疆") number = "杈婇亾涓婃枡鏌ヨ璁㈠崟";
var wp_id = client.ReadByOrder<string>("R_o_wp_id", number);
- var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == wp_id);
- if (mes_Detail == null)
+
+ var Mes_Work = workinfoRepository.Find(x => x.SN == wp_id && x.processCode == (name != "杈婇亾涓婃枡鏌ヨ杞﹁疆" ? "17" : "28")).FirstOrDefault();
+ if (Mes_Work == null)
{
client.WriteByOrder("W_i_status", (byte)2, name);
client.WriteByOrder("R_oi_on", (byte)0, name);
#region 鏃ュ織璁板綍
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
- #endregion
- continue;
- }
- var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
- if (mes_Head == null)
- {
- client.WriteByOrder("W_i_status", (byte)2, name);
- client.WriteByOrder("R_oi_on", (byte)0, name);
- #region 鏃ュ織璁板綍
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
+ WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟淇℃伅", "PCS");
#endregion
continue;
}
+ #region MyRegion
+ //var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == wp_id);
+ //if (mes_Detail == null)
+ //{
+ // client.WriteByOrder("W_i_status", (byte)2, name);
+ // client.WriteByOrder("R_oi_on", (byte)0, name);
+ // #region 鏃ュ織璁板綍
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+ // #endregion
+ // continue;
+ //}
+ //var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
+ //if (mes_Head == null)
+ //{
+ // client.WriteByOrder("W_i_status", (byte)2, name);
+ // client.WriteByOrder("R_oi_on", (byte)0, name);
+ // #region 鏃ュ織璁板綍
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
+ // #endregion
+ // continue;
+ //}
+ #endregion
+
+
if (name != "杈婇亾涓婃枡鏌ヨ杞﹁疆")
{
//var geometry = dataRepository.FindFirst(x => x.TypeId == (Int32)wp_type);
- var geometry = dataRepository.Find(x => x.Description == mes_Head.drawingNo).FirstOrDefault();
- var geometry1 = detectionlineRepository.Find(x => x.Description == mes_Head.drawingNo).FirstOrDefault();
+ var geometry = dataRepository.Find(x => x.Description == Mes_Work.drawingNo).FirstOrDefault();
+ var geometry1 = detectionlineRepository.Find(x => x.Description == Mes_Work.drawingNo).FirstOrDefault();
if (geometry == null && geometry1 == null)
{
//DBExtension.Write(details.Where(x => x.plcdetail_name == "W_i_status").First(), client, (Int16)2);
@@ -121,8 +139,8 @@
}
else
{
- var geometry = detectionlineRepository.Find(x => x.Description == mes_Head.drawingNo).FirstOrDefault();
- var geometry1 = dataRepository.Find(x => x.Description == mes_Head.drawingNo).FirstOrDefault();
+ var geometry = detectionlineRepository.Find(x => x.Description == Mes_Work.drawingNo).FirstOrDefault();
+ var geometry1 = dataRepository.Find(x => x.Description == Mes_Work.drawingNo).FirstOrDefault();
if (geometry == null && geometry1 == null)
{
client.WriteByOrder("W_i_status", (byte)2, name);
@@ -183,6 +201,7 @@
Idt_geometry_dataRepository dataRepository = new dt_geometry_dataRepository(Context);
Idt_geometry_data_detectionlineRepository detectionlineRepository = new dt_geometry_data_detectionlineRepository(Context);
Idt_mes_detailRepository mes_DetailRepository = new dt_mes_detailRepository(Context);
+ IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);
Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
Idt_patternRepository patternRepository = new dt_patternRepository(Context);
var plc = repository.FindFirst(x => x.plcinfo_name == client.PLCName);
@@ -206,16 +225,9 @@
continue;
}
var wp_type = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_o_wp_type").First(), client);
- var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == wp_id);
- #region 娴嬭瘯浣跨敤
- //if (mes_Detail == null)
- //{
- // mes_Detail = mes_DetailRepository.FindFirst(x => x.jobID == (name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? "01180127004-2" : "01180127004-1"));
- // mes_Detail.SN = wp_id;
- // mes_DetailRepository.Update(mes_Detail, true);
- //}
- #endregion
- if (mes_Detail == null)
+
+ var Mes_Work = workinfoRepository.Find(x => x.SN == wp_id && x.processCode == (name != "杈婇亾涓婃枡鏌ヨ璁㈠崟" ? "17" : "28")).FirstOrDefault();
+ if (Mes_Work == null)
{
client.WriteByOrder("W_i_status", (byte)2, name);
client.WriteByOrder("R_oi_on", (byte)0, name);
@@ -224,16 +236,30 @@
#endregion
continue;
}
- var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
- if (mes_Head == null)
- {
- client.WriteByOrder("W_i_status", (byte)2, name);
- client.WriteByOrder("R_oi_on", (byte)0, name);
- #region 鏃ュ織璁板綍
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
- #endregion
- continue;
- }
+ #region MyRegion
+ //var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == wp_id);
+ //if (mes_Detail == null)
+ //{
+ // client.WriteByOrder("W_i_status", (byte)2, name);
+ // client.WriteByOrder("R_oi_on", (byte)0, name);
+ // #region 鏃ュ織璁板綍
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+ // #endregion
+ // continue;
+ //}
+ //var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
+ //if (mes_Head == null)
+ //{
+ // client.WriteByOrder("W_i_status", (byte)2, name);
+ // client.WriteByOrder("R_oi_on", (byte)0, name);
+ // #region 鏃ュ織璁板綍
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
+ // #endregion
+ // continue;
+ //}
+ #endregion
+
+ var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == Mes_Work.jobID);
if (name != "杈婇亾涓婃枡鏌ヨ璁㈠崟")
{
@@ -265,11 +291,11 @@
{
//1-濂�,鍏佽鍔犲伐锛�2-涓嶅湪鍒楄〃涓紝3-涓嶅姞宸ヨ溅杞被鍨嬶紝4-鎵嬪姩鍏ュ簱妯″紡浜哄伐鏈�夋嫨搴撳尯
client.WriteByOrder("W_i_status", (byte)1, name);
- client.WriteByOrder("W_i_job_id", mes_Detail.jobID, name);
- client.WriteByOrder("W_i_drawing_id", mes_Head.drawingNo, name);
- client.WriteByOrder("W_i_heat_id", mes_Detail.heatID, name);
+ client.WriteByOrder("W_i_job_id", Mes_Work.jobID, name);
+ client.WriteByOrder("W_i_drawing_id", Mes_Work.drawingNo, name);
+ client.WriteByOrder("W_i_heat_id", Mes_Work.heatID, name);
//client.WriteByOrder("W_i_sourceheat", "", name);
- client.WriteByOrder("W_i_batch_id", mes_Detail.heatBatchID, name);
+ client.WriteByOrder("W_i_batch_id", Mes_Work.heatBatchID, name);
//灞忚斀宸ヨ壓(灞忚斀瑙嗚妫�娴�/灞忚斀娑傛补)
//if (name != "杈婇亾涓婃枡鏌ヨ杞﹁疆")
@@ -281,7 +307,7 @@
client.WriteByOrder("R_oi_on", (byte)0, name);
#region 鏃ュ織璁板綍
WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" +
- $"\nW_i_job_id锛歿mes_Detail.jobID}\nW_i_drawing_id锛歿mes_Head.drawingNo}\nW_i_heat_id锛歿mes_Detail.heatID}\nW_i_batch_id锛歿mes_Detail.heatBatchID}" +
+ $"\nW_i_job_id锛歿Mes_Work.jobID}\nW_i_drawing_id锛歿Mes_Work.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}" +
$"\nW_i_skip_op_SJ1锛歿(name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? true : mes_Head.skip_op_1)}\nW_i_skip_op_SJ2锛歿(name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? true : mes_Head.skip_op_2)}" +
$"\nW_i_skip_op_LT锛歿mes_Head.skip_op_3}\nR_oi_on锛�0", "PCS");
#endregion
@@ -305,15 +331,15 @@
{
//1-濂�,鍏佽鍔犲伐锛�2-涓嶅湪鍒楄〃涓紝3-涓嶅姞宸ヨ溅杞被鍨嬶紝4-鎵嬪姩鍏ュ簱妯″紡浜哄伐鏈�夋嫨搴撳尯
client.WriteByOrder("W_i_status", (byte)1, name);
- client.WriteByOrder("W_i_job_id", mes_Detail.jobID, name);
- client.WriteByOrder("W_i_drawing_id", mes_Head.drawingNo, name);
- client.WriteByOrder("W_i_heat_id", mes_Detail.heatID, name);
+ client.WriteByOrder("W_i_job_id", Mes_Work.jobID, name);
+ client.WriteByOrder("W_i_drawing_id", Mes_Work.drawingNo, name);
+ client.WriteByOrder("W_i_heat_id", Mes_Work.heatID, name);
//client.WriteByOrder("W_i_sourceheat", "", name);
- client.WriteByOrder("W_i_batch_id", mes_Detail.heatBatchID, name);
+ client.WriteByOrder("W_i_batch_id", Mes_Work.heatBatchID, name);
client.WriteByOrder("R_oi_on", (byte)0, name);
#region 鏃ュ織璁板綍
- WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\nW_i_job_id锛歿mes_Detail.jobID}" +
- $"\nW_i_drawing_id锛歿mes_Head.drawingNo}\nW_i_heat_id锛歿mes_Detail.heatID}\nW_i_batch_id锛歿mes_Detail.heatBatchID}\nR_oi_on锛�0", "PCS");
+ WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\nW_i_job_id锛歿Mes_Work.jobID}" +
+ $"\nW_i_drawing_id锛歿mes_Head.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}\nR_oi_on锛�0", "PCS");
#endregion
}
}
@@ -344,6 +370,7 @@
Idt_geometry_data_detectionlineRepository detectionlineRepository = new dt_geometry_data_detectionlineRepository(Context);
Idt_mes_detailRepository mes_DetailRepository = new dt_mes_detailRepository(Context);
Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
+ IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);
Idt_patternRepository patternRepository = new dt_patternRepository(Context);
var plc = repository.FindFirst(x => x.plcinfo_name == client.PLCName);
var Pipeline_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "閾炬潯鏈�");
@@ -358,6 +385,9 @@
{
var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == name).ToList();
+ var NGStation = "X01001003";
+ if (name == "2鍗曞厓涓嬫枡鍖�") NGStation = "X02001003";
+ if (name == "3鍗曞厓涓嬫枡鍖�") NGStation = "X03001002";
#region MyRegion
//var Wheel_Type = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_Type").First(), client);//杞﹁疆绫诲瀷
//var Wheel_id = client.ReadByOrder<string>("R_Wheel_id", name);//杞﹁疆SN鍙�
@@ -405,33 +435,49 @@
var Wheel_SN = client.ReadByOrder<string>("R_Wheel_id", name);//杞﹁疆SN鍙�
if (string.IsNullOrEmpty(Wheel_SN))
{
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙蜂负绌�", "PCS");
+ //WriteDBLog.Error(name + "鏀炬枡瀹屾垚", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙蜂负绌�", "PCS");
+ WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", "杞﹁疆SN鍙蜂负绌�", "璇诲彇妗佹灦淇℃伅锛�", $"杞﹁疆SN鍙凤細{Wheel_SN}涓虹┖");
continue;
}
//var Wheel_id = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_id").First(), client).ToString();
+ var Mes_Work = workinfoRepository.Find(x => x.SN == Wheel_SN && x.processCode == "17").FirstOrDefault();
+ if (Mes_Work == null)
+ {
+ #region 鏃ュ織璁板綍
+ //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+ WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", Wheel_SN, "璇诲彇妗佹灦淇℃伅锛�", $"杞﹁疆SN鍙凤細{Wheel_SN}鏈煡璇㈠埌宸ュ崟淇℃伅");
+ #endregion
+ continue;
+ }
+ #region MyRegion
+ //var Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_SN);
+ //if (Detail == null)
+ //{
+ // #region 鏃ュ織璁板綍
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+ // #endregion
+ // continue;
+ //}
+ //var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID && x.processCode == "17");
+ //if (Head == null)
+ //{
+ // #region 鏃ュ織璁板綍
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃{Detail.jobID}", "PCS");
+ // #endregion
+ // continue;
+ //}
+ #endregion
- var Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_SN);
- if (Detail == null)
- {
- #region 鏃ュ織璁板綍
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
- #endregion
- continue;
- }
- var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID && x.processCode == "17");
- if (Head == null)
- {
- #region 鏃ュ織璁板綍
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃{Detail.jobID}", "PCS");
- #endregion
- continue;
- }
#endregion
var AreaNr = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_AreaNr").First(), client);
if (AreaNr == 0)
+ {
client.WriteByOrder("W_Storage_update", true, name);//璐т綅鐘舵�佹洿鏂�
+ continue;
+ }
+
var areaCode = PipelineJob.area_code(name); //鏍规嵁涓嬫枡鍙ｅ崟鍏冨悕鑾峰彇鍖哄煙浠ｇ爜
var station = stationinfoRepository.FindFirst(x => x.area == areaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString());
@@ -445,14 +491,19 @@
}
station.bindSN = string.IsNullOrEmpty(station.bindSN) ? Wheel_SN : station.bindSN + "," + Wheel_SN;
+ station.billetID = string.IsNullOrEmpty(station.billetID) ? Mes_Work.billetID.ToString() : station.billetID + "," + Mes_Work.billetID;
station.quantity++;
if (station.quantity == 1)
{
- station.stationType = Head.drawingNo;
- station.Number = Head.jobID;
- station.heatNumber = Detail.heatID;
+ station.stationType = Mes_Work.drawingNo;
+ station.Number = Mes_Work.workOrder;
+ station.heatNumber = Mes_Work.heatID;
station.tray_status = "StrogeTray";
}
+ //else if (station.stationCode == NGStation)
+ //{
+ // station.heatNumber = string.IsNullOrEmpty(station.heatNumber) ? Mes_Work.heatID : station.heatNumber + "," + Mes_Work.heatID;
+ //}
var count = stationinfoRepository.Update(station, true);
if (count < 1)
@@ -463,21 +514,27 @@
client.WriteByOrder("W_IndexNr", (Int16)0, name);//鎵樼洏涓婄殑绗嚑涓溅杞�
client.WriteByOrder("W_Storage_Type", (Int16)0, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
client.WriteByOrder("W_Storage_update", true, name);//璐т綅鐘舵�佹洿鏂�
- WriteDBLog.Success(name + "妗佹灦涓嬫枡瀹屾垚",
- $"璇诲彇妗佹灦淇℃伅锛歕nR_load_finished锛歿finished}\n杞﹁疆SN锛歿Wheel_SN}\n杞瀷ID锛歿WheelType}\n涓嬫枡浣嶅彿锛歿AreaNr}\n\n" +
- $"澶勭悊鍐欏叆妗佹灦淇℃伅锛歕nW_AreaNr锛歿0}\nW_IndexNr锛歿0}\nW_Storage_Type锛歿0}\n\n" +
- $"鍐欏叆妗佹灦淇℃伅锛歕nW_Storage_update锛歿true}\nW_Enabl_Load锛歿false}", "PCS");
+ WriteLog.Write_Log(name + "鏀炬枡瀹屾垚", Wheel_SN, "鎴愬姛锛�",
+ $"璇诲彇妗佹灦淇℃伅锛歕n鏀炬枡瀹屾垚淇″彿锛歿finished}\n杞﹁疆SN锛歿Wheel_SN}\n杞瀷ID锛歿WheelType}\n涓嬫枡浣嶅彿锛歿AreaNr}\n\n" +
+ $"澶勭悊鍐欏叆妗佹灦淇℃伅锛歕n鍖哄煙璐т綅鍙凤細{0}\n鎵樼洏涓婄殑绗嚑涓溅杞細{0}\n鎵樼洏绫诲瀷锛歿0}\n\n" +
+ $"鍐欏叆妗佹灦淇℃伅锛歕n璐т綅鐘舵�佹洿鏂颁俊鍙凤細{true}\n鏄惁鍏佽涓嬫枡锛歿false}");
+ //WriteDBLog.Success(name + "妗佹灦涓嬫枡瀹屾垚",
+ // $"璇诲彇妗佹灦淇℃伅锛歕nR_load_finished锛歿finished}\n杞﹁疆SN锛歿Wheel_SN}\n杞瀷ID锛歿WheelType}\n涓嬫枡浣嶅彿锛歿AreaNr}\n\n" +
+ // $"澶勭悊鍐欏叆妗佹灦淇℃伅锛歕nW_AreaNr锛歿0}\nW_IndexNr锛歿0}\nW_Storage_Type锛歿0}\n\n" +
+ // $"鍐欏叆妗佹灦淇℃伅锛歕nW_Storage_update锛歿true}\nW_Enabl_Load锛歿false}", "PCS");
#endregion
//client.WriteByOrder("W_Enabl_Load", false, name);//鏄惁鍏佽
#region 淇敼宸ュ崟鐘舵��
+ var Detail = mes_DetailRepository.FindFirst(x => x.jobID == Mes_Work.jobID && x.SN == Mes_Work.SN);
Detail.Status = "涓嬬嚎";
Detail.FinishTime = DateTime.Now;
count = mes_DetailRepository.Update(Detail, true);
if (count < 1)
throw new Exception($"宸ュ崟瀛愯〃淇℃伅鏇存柊澶辫触锛佽溅杞甋N鍙凤細{Detail.SN}");
+ var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID);
Head.finishNum = Head.finishNum + 1;
count = mes_HeadRepository.Update(Head, true);
if (count < 1)
@@ -497,7 +554,9 @@
{
client.WriteByOrder("W_Storage_update", false, name);//璐т綅鐘舵�佹洿鏂�
#region 鏃ュ織璁板綍
- WriteDBLog.Success(name + "璐т綅鐘舵�佹洿鏂板浣�", $"璇诲彇妗佹灦淇℃伅锛歕nR_load_finished锛歿finished}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_Storage_update锛歿false}", "PCS");
+ //WriteDBLog.Success(name + "璐т綅鐘舵�佹洿鏂板浣�", $"璇诲彇妗佹灦淇℃伅锛歕nR_load_finished锛歿finished}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_Storage_update锛歿false}", "PCS");
+ WriteLog.Write_Log(name + "鏀炬枡瀹屾垚", name + "璐т綅鐘舵�佹洿鏂颁俊鍙峰浣�", "鎴愬姛锛�",
+ $"璇诲彇妗佹灦淇℃伅锛歕n鏀炬枡瀹屾垚淇″彿锛歿finished}\n\n鍐欏叆妗佹灦淇℃伅锛歕n璐т綅鐘舵�佹洿鏂颁俊鍙凤細{false}");
#endregion
}
#endregion
@@ -505,44 +564,61 @@
var Request = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Request_Load").First(), client);
if (!Request) continue;
+ //var Area = client.ReadByOrder<Int16>("W_AreaNr", name);//璇诲彇璐т綅鍙蜂俊鎭�
+ //if (Area != 0) continue;
+
#region 璇诲彇妗佹灦淇℃伅
var Wheel_Type = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_Type").First(), client);//杞﹁疆绫诲瀷
var Wheel_id = client.ReadByOrder<string>("R_Wheel_id", name);//杞﹁疆SN鍙�
- if (string.IsNullOrEmpty(Wheel_id)) continue;
- //var Wheel_id = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_id").First(), client).ToString();
+ if (string.IsNullOrEmpty(Wheel_id))
+ {
+ WriteLog.Write_Log(name + "鐢宠鏀炬枡寮傚父", "杞﹁疆SN鍙蜂负绌�", "", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_id}涓虹┖");
+ continue;
+ }
- var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_id);
- if (mes_Detail == null)
+
+ var Work = workinfoRepository.Find(x => x.SN == Wheel_id && x.processCode == "17").FirstOrDefault();
+ if (Work == null)
{
- #region 鏃ュ織璁板綍
client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
- #endregion
- continue;
+ //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟淇℃伅", "PCS");
+ WriteLog.Write_Log(name + "鐢宠鏀炬枡寮傚父", Wheel_id, "鏌ヨ鏈哄姞宸ュ伐鍗�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_id}鏈煡璇㈠埌宸ュ崟淇℃伅\n鍐欏叆妗佹灦淇℃伅锛歕n鏄惁鍏佽涓嬫枡锛歿false}");
}
- var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
- if (mes_Head == null)
- {
- #region 鏃ュ織璁板綍
- client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
- WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
- #endregion
- continue;
- }
+
+ #region MyRegion
+ //var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_id);
+ //if (mes_Detail == null)
+ //{
+ // #region 鏃ュ織璁板綍
+ // client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+ // #endregion
+ // continue;
+ //}
+ //var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
+ //if (mes_Head == null)
+ //{
+ // #region 鏃ュ織璁板綍
+ // client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ // WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
+ // #endregion
+ // continue;
+ //}
+ #endregion
+
#endregion
- var Stations = stationinfoRepository.Find(x => x.area == PipelineJob.area_code(name));
+ var Stations = stationinfoRepository.Find(x => x.area == PipelineJob.area_code(name)).OrderBy(x => x.lastUpdateTime).ToList();
- var NGStation = "X01001003";
- if (name == "2鍗曞厓涓嬫枡鍖�") NGStation = "X02001003";
- if (name == "3鍗曞厓涓嬫枡鍖�") NGStation = "X03001002";
- foreach (var station in Stations) //浠讳綍涓�涓笅鏂欎綅涓虹┖鎴栫鐢ㄦ椂,閮戒細鍋滄妗佹灦
- {
- if (!station.enable || station.location_state == LocationStateEnum.Empty.ToString())
- client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
- }
+
+ //foreach (var station in Stations) //浠讳綍涓�涓笅鏂欎綅涓虹┖鎴栫鐢ㄦ椂,閮戒細鍋滄妗佹灦
+ //{
+ // if (!station.enable || station.location_state == LocationStateEnum.Empty.ToString())
+ // client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ //}
+
#region MyRegion
//var currentAreaNr = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_Are00aNr").First(), client);
//var currentAreaCode = PipelineJob.area_code(name); //鏍规嵁涓嬫枡鍙ｅ崟鍏冨悕鑾峰彇鍖哄煙浠ｇ爜
@@ -552,35 +628,40 @@
#endregion
- var wheel = PipelineJob.QueryMateriel(mes_Head.drawingNo);
- var wheel1 = PipelineJob.QueryMateriel1(mes_Head.drawingNo);
+ var wheel = PipelineJob.QueryMateriel(Work.drawingNo);
+ var wheel1 = PipelineJob.QueryMateriel1(Work.drawingNo);
if (wheel == null && wheel1 == null)
{
#region 鏃ュ織璁板綍
client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
- WriteDBLog.Error(name, $"鏈煡璇㈠埌杞﹁疆淇℃伅锛�", "PCS");
+ //WriteDBLog.Error(name, $"鏈煡璇㈠埌杞﹁疆淇℃伅锛�", "PCS");
+ WriteLog.Write_Log(name + "鐢宠鏀炬枡寮傚父", Wheel_id, $"鏌ヨ{Work.drawingNo}杞﹁疆鍙傛暟", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_id}鏈煡璇㈠埌宸ュ崟淇℃伅\n鍐欏叆妗佹灦淇℃伅锛歕n鏄惁鍏佽涓嬫枡锛歿false}");
#endregion
continue;
}
var PartStatus = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PartStatus").First(), client);//1:ok;2:nok
+
+ var load_zone = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_load_zone").First(), client);
#region 鏃ュ織璁板綍
- WriteDBLog.Success(name + "鐢宠鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細{PartStatus}", "PCS");
+ //WriteDBLog.Success(name + "鐢宠鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細{PartStatus}\n鏄惁杩涘叆涓嬫枡鍖猴細{load_zone}", "PCS");
+ WriteLog.Write_Log(name + "鐢宠鏀炬枡", Wheel_id, "鐢宠鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細{PartStatus}\n鏄惁杩涘叆涓嬫枡鍖猴細{load_zone}");
+ if (load_zone) continue;
#endregion
if ((Int16)PartStatus == 1)
{
dt_stationinfo Stationinfo = null;
- if (mes_Detail.heatID != null)
+ if (Work.heatID != null)
{
Stationinfo = Stations
.Where(x => x.enable
&& x.stationCode != NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
&& x.quantity < 5
- && x.stationType == mes_Head.drawingNo
- && x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
- && x.Number == mes_Detail.jobID
- && x.heatNumber == mes_Detail.heatID)
+ && x.stationType == Work.drawingNo
+ //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
+ && x.Number == Work.workOrder
+ && x.heatNumber == Work.heatID)
.OrderByDescending(x => x.quantity)
.FirstOrDefault();
}
@@ -591,15 +672,16 @@
&& x.stationCode != NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
&& x.quantity < 5
- && x.stationType == mes_Head.drawingNo
- && x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
- && x.Number == mes_Detail.jobID)
+ && x.stationType == Work.drawingNo
+ //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
+ && x.Number == Work.workOrder)
.OrderByDescending(x => x.quantity)
.FirstOrDefault();
}
if (Stationinfo == null)
{
+
#region 涓嬫枡浣嶆潯浠朵笉鍖归厤鐩存帴瑙﹀彂鍏ュ簱浠诲姟
//var stationinfos = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).ToList();
//foreach (var stationinfo in stationinfos)
@@ -613,23 +695,12 @@
var NG = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
if (NG != null)
{
- if (NG.stationType != mes_Head.drawingNo)
- agvtask(stationinfoRepository, NG, (wheel == null ? wheel1.e : wheel.e), "TaskType_OutsourceInbound");
+ if (NG.stationType != Work.drawingNo || NG.Number != Work.workOrder)
+ agvtask(stationinfoRepository, NG, Work, "TaskType_OutsourceInbound");
}
#endregion
Stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 0).FirstOrDefault();
-
- #region 娌℃墭鐩樺彲鐢�,瑙﹀彂鍏ュ簱浠诲姟
- if (Stationinfo == null)
- {
- var stationinfos = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).ToList();
- foreach (var stationinfo in stationinfos)
- {
- agvtask(stationinfoRepository, stationinfo, (wheel == null ? wheel1.e : wheel.e), name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
- }
- }
- #endregion
#region MyRegion
//var stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
@@ -642,8 +713,26 @@
if (Stationinfo != null)
{
+
+ #region 鎹㈢被鍨嬬洿鎺ュ叆搴�
+ var stationinfo1 = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0 && x.stationType != Work.drawingNo).FirstOrDefault();
+ if (stationinfo1 != null)
+ agvtask(stationinfoRepository, stationinfo1, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
+ #endregion
+
+ #region 鎵樼洏杞﹁疆鍫嗗灈绗洓涓椂涓嬪彂鍙﹀涓�涓倝鍙风殑鍏ュ簱浠诲姟
+ if (Stationinfo.quantity + 1 >= 4)
+ {
+ var stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
+ if (stationinfo != null)
+ agvtask(stationinfoRepository, stationinfo, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
+ }
+
+ #endregion
+
#region 鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏
- if (Stationinfo.tray_type != ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray"))
+ //if (Stationinfo.tray_type != ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray"))
+ if (Stationinfo.tray_type != "LargeTray" && (wheel == null ? wheel1.e : wheel.e) > 1100)
{
client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
@@ -675,9 +764,25 @@
#region 璐т綅鏁伴噺涓庡厜鐢典笉鍖归厤锛屾姤璀�
if (list.Count > 0 && MaterialSignal != 1)
+ {
+ client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
- //else if (list.Count < 1 && MaterialSignal == 1)
- // Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+ Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+ Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+ stationinfoRepository.Update(Stationinfo, true);
+ WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+ //WriteDBLog.Error(name+"鐢宠涓嬫枡",$"{Stationinfo.stationCode}鐨勮揣浣�","PCS");
+ }
+ else if (list.Count < 1 && MaterialSignal == 1)
+ {
+ client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+ Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+ Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+ stationinfoRepository.Update(Stationinfo, true);
+ WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+ }
+
#endregion
//缂撳瓨鏋朵笂杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�
@@ -696,13 +801,33 @@
client.WriteByOrder("W_Storage_Type", (Int16)1, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
client.WriteByOrder("W_Enabl_Load", true, name);//鏄惁鍏佽
#region 鏃ュ織璁板綍
- WriteDBLog.Success(name + "鍏佽鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細OK" +
+ //WriteDBLog.Success(name + "鍏佽鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細OK" +$"\n璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}" +
+ // $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\nW_Enabl_Load锛歵rue", "PCS");
+ WriteLog.Write_Log(name + "鐢宠鏀炬枡", Wheel_id, "鍏佽鏀炬枡",
+ $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細鍚堟牸" +
$"\n璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}" +
- $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\nW_Enabl_Load锛歵rue", "PCS");
+ $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\n鏄惁鍏佽涓嬫枡锛歵rue");
#endregion
continue;
}
}
+ else
+ {
+ #region 娌℃墭鐩樺彲鐢�,瑙﹀彂鍏ュ簱浠诲姟
+ if (!Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state != LocationStateEnum.Stroge.ToString()).Any())
+ {
+ var station = Stations.Where(x => x.enable && x.stationCode != NGStation).OrderBy(x => x.lastUpdateTime).FirstOrDefault();
+ agvtask(stationinfoRepository, station, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
+ }
+
+ //var stationinfos = Stations.Where(x => x.enable && x.Number != Work.workOrder && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).ToList();
+ //foreach (var stationinfo in stationinfos)
+ //{
+ // agvtask(stationinfoRepository, stationinfo, Work, name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
+ //}
+ #endregion
+ }
+
}
else if ((Int16)PartStatus == 2)
{
@@ -728,24 +853,30 @@
&& x.stationCode == NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
&& x.quantity < 5
- && x.stationType == mes_Head.drawingNo
- && x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
+ && x.stationType == Work.drawingNo
+ //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
/*&& x.Number == mes_Detail.jobID*/).FirstOrDefault();
//}
if (Stationinfo == null)
{
- var stationinfo = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
- if (stationinfo != null)
+ #region 瑙﹀彂NG浠诲姟
+ var NG = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
+ if (NG != null)
{
- agvtask(stationinfoRepository, stationinfo, (wheel == null ? wheel1.e : wheel.e), "TaskType_OutsourceInbound");
+ agvtask(stationinfoRepository, NG, Work, "TaskType_OutsourceInbound");
+ continue;
}
+
+ #endregion
+
Stationinfo = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 0).FirstOrDefault();
}
if (Stationinfo != null)
{
#region 鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏
- if (Stationinfo.tray_type != ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray"))
+ //if (Stationinfo.tray_type != ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray"))
+ if (Stationinfo.tray_type != "LargeTray" && (wheel == null ? wheel1.e : wheel.e) > 1100)
{
Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
Stationinfo.tray_type = Stationinfo.tray_type == "SmallTray" ? "SmallTray/LargeTray" : "LargeTray/SmallTray";
@@ -770,10 +901,31 @@
}
#region 璐т綅鏁伴噺涓庡厜鐢典笉鍖归厤锛屾姤璀�
- if (list.Count > 0 && MaterialSignal != 1)
- Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+ //if (list.Count > 0 && MaterialSignal != 1)
+ // Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
//else if (list.Count < 1 && MaterialSignal == 1)
// Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+
+ if (list.Count > 0 && MaterialSignal != 1)
+ {
+ client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+ Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+ Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+ stationinfoRepository.Update(Stationinfo, true);
+ WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+
+ //WriteDBLog.Error(name+"鐢宠涓嬫枡",$"{Stationinfo.stationCode}鐨勮揣浣�","PCS");
+ }
+ else if (list.Count < 1 && MaterialSignal == 1)
+ {
+ client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+ Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+ Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+ Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+ stationinfoRepository.Update(Stationinfo, true);
+ WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+ }
#endregion
//缂撳瓨鏋朵笂杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�
@@ -792,9 +944,12 @@
client.WriteByOrder("W_Storage_Type", (Int16)1, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
client.WriteByOrder("W_Enabl_Load", true, name);//鏄惁鍏佽
#region 鏃ュ織璁板綍
- WriteDBLog.Success(name + "鍏佽鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細NG" +
+ //WriteDBLog.Success(name + "鍏佽鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細NG" +$"\n璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}" +
+ // $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\nW_Enabl_Load锛歵rue", "PCS");
+ WriteLog.Write_Log(name + "鐢宠鏀炬枡", Wheel_id, "鍏佽鏀炬枡",
+ $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細鍚堟牸" +
$"\n璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}" +
- $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\nW_Enabl_Load锛歵rue", "PCS");
+ $"\n\n鍐欏叆妗佹灦淇℃伅锛歕n涓嬫枡浣嶅彿锛歿area}\n绗嚑涓溅杞細{(Stationinfo.quantity + 1)}\n鎵樼洏绫诲瀷锛�1\n鏄惁鍏佽涓嬫枡锛歵rue");
#endregion
continue;
}
@@ -867,63 +1022,80 @@
}
#endregion
- /// <summary>
- /// AGV浠诲姟
- /// </summary>
- public void agvtask(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo stationinfo, float e, string tasktype)
+ public void agvtask(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo stationinfo, VV_Mes_Workinfo Work, string tasktype)
{
VOLContext Context = new VOLContext();
Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
- Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
-
var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();
if (task != null) return;
- var mes_Head = mes_HeadRepository.Find(x => x.jobID == stationinfo.Number).FirstOrDefault();
- if (mes_Head == null)
- {
- stationinfo.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟澶磋〃锛�";
- stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
- stationinfoRepository.Update(stationinfo, true);
- return;
- }
-
- dt_stationinfo TargetLocation = null;
- int CompeletedNum = Convert.ToInt32(mes_Head.quantity) - Convert.ToInt32(mes_Head.finishNum);
- if (mes_Head.quantity <= 50) tasktype = "TaskType_OutsourceInbound";
-
- if (tasktype == "TaskType_OutsourceInbound")
- TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
- else if (tasktype == "TaskType_Inbound")
- TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository, mes_Head, stationinfo, CompeletedNum, e);
- if (TargetLocation != null)
- {
- dt_agvtask agvtask = new dt_agvtask()
- {
- agv_fromaddress = stationinfo.stationCode,
- agv_id = Guid.NewGuid(),
- agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- agv_grade = 1,
- agv_createtime = DateTime.Now,
- agv_taskstate = "Create",
- agv_materielid = stationinfo.stationType,
- agv_qty = stationinfo.quantity,
- agv_tasktype = tasktype,
- agv_toaddress = TargetLocation.stationCode,
- agv_userid = "绯荤粺",
- bindSN = stationinfo.bindSN,
- agv_worktype = Convert.ToInt32(mes_Head.processCode),
- agv_materbarcode = mes_Head.materialCode,
- agv_Traytype = stationinfo.tray_type,
- jobID = stationinfo.Number,
- agv_TrayStatus = stationinfo.tray_status
- };
- agvtaskRepository.Add(agvtask, true);
- stationinfo.location_state = LocationStateEnum.InBusy.ToString();
- stationinfoRepository.Update(stationinfo, true);
- TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
- TargetLocation.stationType = agvtask.agv_materielid;
- stationinfoRepository.Update(TargetLocation, true);
- }
+ if (!string.IsNullOrEmpty(Work.area))
+ tasktype = "TaskType_OutsourceInbound";
+ AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, stationinfo, tasktype, Work);
}
+
+ #region MyRegion
+ /// <summary>
+ /// AGV浠诲姟
+ /// </summary>
+ //public void agvtask(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo stationinfo, VV_Mes_Workinfo Work, string tasktype)
+ //{
+ // VOLContext Context = new VOLContext();
+ // Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
+ // Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
+
+ // var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();
+ // if (task != null) return;
+ // //var mes_Head = mes_HeadRepository.Find(x => x.jobID == Work.jobID).FirstOrDefault();
+ // //if (mes_Head == null)
+ // //{
+ // // stationinfo.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟澶磋〃锛�";
+ // // stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+ // // stationinfoRepository.Update(stationinfo, true);
+ // // return;
+ // //}
+
+ // dt_stationinfo TargetLocation = null;
+ // //int CompeletedNum = Convert.ToInt32(mes_Head.quantity) - Convert.ToInt32(mes_Head.finishNum);
+ // //if (mes_Head.quantity <= 50) tasktype = "TaskType_OutsourceInbound";
+
+ // if (tasktype == "TaskType_OutsourceInbound" || !string.IsNullOrEmpty(Work.area))
+ // TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
+ // else if (tasktype == "TaskType_Inbound")
+ // TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, Work, stationinfo);
+ // //TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, mes_Head, stationinfo);
+ // if (TargetLocation != null)
+ // {
+ // dt_agvtask agvtask = new dt_agvtask()
+ // {
+ // agv_fromaddress = stationinfo.stationCode,
+ // agv_id = Guid.NewGuid(),
+ // agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
+ // agv_grade = 1,
+ // agv_createtime = DateTime.Now,
+ // agv_taskstate = "Create",
+ // agv_materielid = stationinfo.stationType,
+ // agv_qty = stationinfo.quantity,
+ // agv_tasktype = tasktype,
+ // agv_toaddress = TargetLocation.stationCode,
+ // agv_userid = "绯荤粺",
+ // bindSN = stationinfo.bindSN,
+ // agv_worktype = Convert.ToInt32(Work.processCode),
+ // agv_materbarcode = Work.materialCode,
+ // agv_Traytype = stationinfo.tray_type,
+ // jobID = stationinfo.Number,
+ // agv_TrayStatus = stationinfo.tray_status
+ // };
+ // agvtaskRepository.Add(agvtask, true);
+ // stationinfo.location_state = LocationStateEnum.InBusy.ToString();
+ // stationinfoRepository.Update(stationinfo, true);
+ // TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
+ // TargetLocation.stationType = agvtask.agv_materielid;
+ // TargetLocation.heatNumber = stationinfo.heatNumber;
+ // TargetLocation.Number = agvtask.jobID;
+ // stationinfoRepository.Update(TargetLocation, true);
+ // }
+ //}
+ #endregion
+
}
}
--
Gitblit v1.9.3