From b71144811c970ddb7296f5243f722ec6b00cf805 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期四, 13 三月 2025 18:52:52 +0800
Subject: [PATCH] 程序修改
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 356 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 222 insertions(+), 134 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index be78de6..eced7d0 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -28,6 +28,8 @@
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
+ private static int fendao = 1;
+
public static void OnChangeEvent(object sender, EventArgs e)
{
try
@@ -997,10 +999,11 @@
string groupMsg = "";
if (modDevice.StationNum == "27")
{
- var Qty = plcConn.GetPlcDBValue(PLCDataTypeEnum.Int,"DB135.0").ToString();//鑾峰彇鍙犳墭鏈哄彔鎵樻暟閲�
- groupMsg = http.BindPlnInHouseWcs(Qty, palletVal);
+ var (res2,Qty) = plcConn.GetPlcDBValue(PLCDataTypeEnum.Short,"DB135","0");//鑾峰彇鍙犳墭鏈哄彔鎵樻暟閲�
+
+ groupMsg = http.BindPlnInHouseWcs(Qty.ToString(), palletVal);
- if (!groupMsg.Contains("-1"))
+ if (groupMsg.Contains("-1"))
{
var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
if (res350.IsSucceed && palletVal350 != "350")
@@ -1017,8 +1020,8 @@
{
plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
}
+ break;
}
- break;
}
string IsBale = "0";
strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo);
@@ -1427,6 +1430,9 @@
var (res2, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
var modPosStarStationNum = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
var (res3, starVal) = plcConn.GetPlcDBValue(modPosStarStationNum.PosType, modDevice.DbNumber, modPosStarStationNum.PlcPos);
+ string tasknoVal = taskVal.ToString();
+ ////string b = taskVal.GetValue();
+ //string a = palletVal.ToString();
// 鎻掑叆浠诲姟鏄庣粏
var modInsertTaskMonitor = new WcsTaskMonitor()
{
@@ -1436,10 +1442,10 @@
InteractiveMsg = $"鍐欏叆鎸囦护430锛氭墭鐩樺埌杈緖modDevice.StationNum}宸ヤ綅",
PalletNo = palletVal,
Status = TaskStatusEnum.Complete,
- StartLocat = starVal,
+ StartLocat = starVal.ToString(),
EndLocat = modDevice.StationNum,
};
-
+
// 鎻掑叆浜や簰鏃ュ織
_db.Insertable(modInsertTaskMonitor).ExecuteCommand();
@@ -1483,7 +1489,7 @@
var (res2, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
var modPosStarStationNum = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
var (res3, starVal) = plcConn.GetPlcDBValue(modPosStarStationNum.PosType, modDevice.DbNumber, modPosStarStationNum.PlcPos);
-
+
string tasknoVal = taskVal.ToString();
var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
if (modTask == null)
@@ -1749,8 +1755,53 @@
#endregion
+
}
break;
+ #region 灏忚溅鍙斁淇″彿
+ case "150":
+ { // 鑾峰彇宸ヤ綅浠诲姟鍙蜂俊鎭�
+ var strMsg = "";
+ var http = new HttpService();
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ if (res1.IsSucceed)
+ {
+ string tasknoVal = val.ToString();
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
+ if (modTask == null)
+ {
+ //璇诲彇鎴愬姛鍚庡啓鍏�151
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "151");//鏀跺埌鍙斁淇″彿鍚庡啓鍏�151
+ if (ret.IsSucceed)
+ {
+ //鍥炰紶WMS鍙斁淇″彿
+ strMsg = http.RequesContinueAgv(val.ToString(), modDevice.StationNum);
+ if (!strMsg.Contains("-1"))
+ {
+ // 鎻掑叆浠诲姟鏄庣粏
+ var modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = tasknoVal,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护151锛歿modDevice.StationNum}宸ヤ綅鍙帴鍙桝GV鏀捐揣鍏ュ簱",
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modDevice.StationNum
+ };
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ }
+ }
+ break;
+ }
+ }
+ //
+
+ }
+ break;
+ #endregion
default: break;
}
@@ -1801,7 +1852,7 @@
private static async void BoxConveyorLine(WcsDeviceDto modDevice)
{
var plcConn = modDevice.PLCUtil;
-
+ //浜屾ゼ涓绘壂鍒嗛亾
if (modDevice.DbNumber == "DB101")//&& modDevice.DbNumber == "DB102"&& (modDevice.DbNumber == "DB102"||modDevice.PlcIdIP == "10.18.51.110")
{
// 涓绘壂浜や簰娴佺▼
@@ -1811,15 +1862,26 @@
// 涓绘壂鐢宠鍒嗛亾 wcs鍐欏叆2
{
// 鍒ゆ柇鏄惁婕旂ず妯″紡 true锛氭紨绀烘ā寮� false:鐢熶骇妯″紡
- if (PLCTaskAction.boDemo)
+ if (PLCTaskAction.boDemo)
{
// 閫氶亾鍙�
var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
- // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
+ // 婕旂ず妯″紡鐩存帴鍐欏叆鍒嗛亾鍙�
+ //Random random = new Random();
+ //int ranNumber = random.Next(2) == 0 ? 1 : 5;
+ if (fendao == 1)
+ {
+ fendao = 5;
+ }
+ else
+ {
+ fendao = 1;
+ }
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, fendao.ToString()); //
if (ret.IsSucceed)
{
+ Log.Information(string.Format("鍒嗛亾鎴愬姛锛岄亾鍙锋槸锛�" + fendao));
// 鍐欏叆娴佺▼鎺у埗瀛� 2
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
if (!retVal.IsSucceed)
@@ -1899,7 +1961,7 @@
{
// 鍒ゆ柇鏄惁鍏宠仈鍗曟嵁 wcsordertask
var orderModel = _db.Queryable<WcsOderTask>()
- .First(m => m.SkuNo == boxInfo.SkuNo && m.Status== TaskStatusEnum.Wait && m.LotNo == boxInfo.LotNo && m.IsDelete == false);
+ .First(m => m.SkuNo == boxInfo.SkuNo && m.Status == TaskStatusEnum.Wait && m.LotNo == boxInfo.LotNo && m.IsDelete == false);
if (orderModel != null)
{
// 鏍规嵁boxinfo琛ㄤ骇绾垮瓧娈佃嚜鍔ㄧ粦瀹氬垎閬�(1绾夸骇鍝佸彧鑳界粦瀹氬埌8閬�)
@@ -1930,7 +1992,7 @@
break;
}
- foreach (var lineNoModel in lineNoModels)
+ foreach (var lineNoModel in lineNoModels)
{
// 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
var (respg, pzNo) = plcConn.GetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos);
@@ -1941,7 +2003,7 @@
// plc姝ゅ垎閬撴湭瑙ｇ粦
break;
}
- else
+ else
{
// 鑷姩缁戝畾鍒嗛亾
lineNoModel.OrderNo = orderModel.OrderNo;
@@ -1972,7 +2034,7 @@
}
}
}
- else
+ else
{
// 璇诲彇plc澶辫触
break;
@@ -1980,7 +2042,7 @@
}
}
- else
+ else
{
// 鑻ユ病鏈夌┖闂查亾锛岃繘琛屽墧闄ゅ鐞嗐�傞槻姝㈠牭濉炰欢绠辩嚎
var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
@@ -1997,7 +2059,7 @@
break;
}
}
- else
+ else
{// 缁戝畾鍒�8閬�
// 鑾峰彇鏈粦瀹氶亾
var lineNo8Model = _db.Queryable<WcsCheckTask>()
@@ -2070,7 +2132,7 @@
// 璇诲彇plc澶辫触
break;
}
-
+
}
else
@@ -2091,7 +2153,7 @@
}
}
}
- else
+ else
{
// 涓嶅叧鑱斿崟鎹洿鎺ヨ繘琛屽墧闄ゅ鐞�
var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
@@ -2124,7 +2186,7 @@
IsBaleModel2 ret1 = http.RequestBoxno(boxNoVal);
if (ret1.Success == -1)
{
- Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細"+boxNoVal);
+ Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細" + boxNoVal);
break;
}
}
@@ -2140,10 +2202,88 @@
default: break;
}
}
- else
+ //涓�妤间富鎵垎閬�
+ else if (modDevice.DbNumber == "DB102")
+ {
+ switch (modDevice.Value.ToString())
+ {
+ case "1":
+ // 1妤间欢绠盤LC璇锋眰WCS璇荤爜
+ {
+ // 璇诲彇plc绠辩爜
+ var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "涓绘壂鏉＄爜");
+ var (res, boxNo) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
+ if (string.IsNullOrWhiteSpace(boxNo.ToString()))
+ {
+
+ // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 绠辩爜
+ string boxNoVal = boxNo.ToString();
+ // 閫氶亾鍙�
+ var modLineNo = modDevice.listStation.FirstOrDefault(m => m.Text == "閫氶亾鍙�");
+
+ // 璋冪敤wms鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�
+ var http = new HttpService();
+ RequestloadingAddre requesModel = http.ResultBoxInfoExportWcs(boxNoVal);
+ if (requesModel.Success != "1")
+ {
+ // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+ var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("鍑哄簱鍒嗘嫞鏍规嵁绠辩爜鑾峰彇瑁呰溅鍙ｅけ璐ワ紝杩涜鍓旈櫎銆�" + requesModel.Message);
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 鍐欏叆鍑哄簱鍒嗛亾鍙�
+ // var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
+ var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ break;
+ }
+ }
+ }
+ }
+ }; break;
+ case "10":
+ // 1妤间欢绠盤LC璇荤爜澶辫触锛學CS涓嶅仛澶勭悊鐩存帴鍓旈櫎鎵嬫寔鎷ｈ揣銆�
+ {
+
+ }; break;
+ default:
+ break;
+ }
+ }
+ else
{
// 鎻掔爜浜や簰
- switch (modDevice.Value.ToString())
+ switch (modDevice.Value.ToString())
{
case "1":
// 鎵樼洏鏉＄爜鍙
@@ -2153,7 +2293,7 @@
// 璇诲彇PLC鎵樼洏鏉＄爜鍙�
var (res, palletVal) = plcConn.GetPlcDBValue(modPalletNo.PosType, modDevice.DbNumber, modPalletNo.PlcPos);
string palletNo = palletVal.ToString();
- if (string.IsNullOrEmpty(palletNo))
+ if (string.IsNullOrEmpty(palletNo))
{
Log.Error(string.Format("{0}锛岃鍙栫殑鎵樼洏鍙蜂负null", modDevice.Text));
break;
@@ -2161,18 +2301,18 @@
// 鏍规嵁宸ヤ綅鍙峰皢鎵樼洏鍙蜂繚瀛樺湪鍒嗛亾琛�
var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
- if (checkTaskMedel == null)
+ if (checkTaskMedel == null)
{
Log.Error(string.Format("鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栧垎閬撳け璐�!", modDevice.StationNum));
break;
}
checkTaskMedel.PalletNo = palletNo;
var rowCount = _db.Updateable(checkTaskMedel).ExecuteCommand();
- if (rowCount > 0 )
+ if (rowCount > 0)
{
// plc鍐欏叆璇诲彇鎴愬姛琛ㄧず 2
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
+ if (retVal.IsSucceed)
{
// liudl 姝ゅ闇�娣诲姞
// 閫氱煡鍒嗘嫞鐮佸灈椤垫洿鏂�
@@ -2192,24 +2332,24 @@
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
break;
}
- else
+ else
{
// 鑾峰彇绠辨潯鐮�
// 鑾峰彇绠辨潯鐮侀厤缃�
var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "绠辨潯鐮�");
var (res, boxVal) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
string boxNo = boxVal.ToString();
- if (string.IsNullOrEmpty(boxNo))
+ if (string.IsNullOrEmpty(boxNo))
{
- Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮佷负null鎻掔爜澶辫触!璇蜂汉宸ュ己鍒剁粨鎵广��" );
+ Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮佷负null鎻掔爜澶辫触!璇蜂汉宸ュ己鍒剁粨鎵广��");
// 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
-
+
break;
}
// 楠岃瘉绠辩爜琛ㄦ槸鍚﹀瓨鍦ㄦ绠辩爜
var boxInfo = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.BoxNo == boxNo).ToList();
- if (boxInfo.Count == 0)
+ if (boxInfo.Count == 0)
{
Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮亄boxNo}涓嶅瓨鍦�!璇蜂汉宸ュ己鍒剁粨鎵广��");
// 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
@@ -2224,38 +2364,46 @@
break;
}
string palletNo = checkTaskMedel.PalletNo;
- if (string.IsNullOrEmpty(palletNo))
+ if (string.IsNullOrEmpty(palletNo))
{
- Log.Error(string.Format("鑾峰彇鐮佸灈宸ヤ綅{0}涓婄殑鎵樼洏鍙峰け璐ワ紒",modDevice.StationNum));
+ Log.Error(string.Format("鑾峰彇鐮佸灈宸ヤ綅{0}涓婄殑鎵樼洏鍙峰け璐ワ紒", modDevice.StationNum));
break;
}
// 淇敼鎻掔爜琛�
- foreach (WcsBoxInfo item in boxInfo)
+ foreach (WcsBoxInfo item in boxInfo)
{
item.PalletNo = palletNo;
item.UpdateTime = DateTime.Now;
+ item.OrderCode = checkTaskMedel.OrderNo;
}
var rowCount = _db.Updateable(boxInfo).ExecuteCommand();
- Log.Information(string.Format("鎻掔爜鎴愬姛锛岀鐮佹槸锛�"+ boxNo, modDevice.StationNum));
+ Log.Information(string.Format("鎻掔爜鎴愬姛锛岀鐮佹槸锛�" + boxNo, modDevice.StationNum));
if (rowCount > 0)
{
// 鎻掔爜鎴愬姛
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
-
+
//鏄惁缁撴壒绠�
- if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed)
+ if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed)
{
// 瑙﹀彂缁撴壒 鍒嗛亾鍙樹负缁撴壒涓�
AutoEndLot(boxInfo[0].LotNo, plcConn, "2");
}
+
+ //妫�鏌ュ凡鐮佸灈绠辨暟锛岀爜鍨涙暟閲忎笌瀹屽伐鏁伴噺鐩哥瓑鍚庤嚜鍔ㄧ粨鎵�
+ //var finishiqty = _db.Queryable<WcsBoxInfoLog>().Count(m => m.SkuNo = )
+ //if (true)
+ //{
+
+ //}
}
- else
+ else
{
// 鎻掔爜澶辫触
Log.Error($"绠辩爜{boxNo};鐮佸灈宸ヤ綅{modDevice.StationNum}锛屾彃鐮佸け璐ワ紝璇峰己鍒剁粨鎵�");
var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
- if (retVal.IsSucceed)
+ if (retVal.IsSucceed)
{
// 瑙﹀彂缁撴壒 涓嶈В缁戝垎閬�
AutoEndLot(boxInfo[0].LotNo, plcConn, "1");
@@ -2266,8 +2414,8 @@
break;
case "40":
// 璇锋眰缁勬墭锛岀敵璇峰叆搴�
- {
- lock (OLock)
+ {
+ lock (OLock)
{
// 鏍规嵁宸ヤ綅鍙凤紝鑾峰彇鎵樼洏鍙�
var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
@@ -2280,7 +2428,7 @@
// 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
- if (retVal.IsSucceed)
+ if (retVal.IsSucceed)
{
// 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
@@ -2303,11 +2451,11 @@
Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
break;
}
- else
+ else
{
// 鑾峰彇鍏ュ簱浠诲姟淇℃伅
var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing));
- if (taskModel != null)
+ if (taskModel != null)
{
// 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
@@ -2362,10 +2510,10 @@
// taskModel.Status = TaskStatusEnum.Doing;
// _db.Updateable(taskModel).ExecuteCommand();
//}
- }
+ }
}
}
- else
+ else
{
// 鏍规嵁鎵樼洏鍙凤紝灏嗙粍鎵樹俊鎭彃鍏oxinfolog琛� 骞跺垹闄oxinfo琛ㄦ暟鎹�
var boxInfoList = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.PalletNo == palletNo).ToList();
@@ -2382,6 +2530,24 @@
}
break;
}
+ //鍒ゆ柇鎵樼洏涓婄殑绠辩爜鏄惁宸茬粍鐩�
+ foreach (var item in boxInfoList)
+ {
+ var groupBoxno = _db.Queryable<WcsBoxInfoLog>().Where(w => w.BoxNo == item.BoxNo).ToList();
+ if (groupBoxno.Count>0)
+ {
+ Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0}锛岀鐮佷俊鎭笉瀛樺湪", modDevice.StationNum));
+ // 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
+ var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
+ if (retVal.IsSucceed)
+ {
+ // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+ retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+ }
+ break;
+ }
+ }
+
// 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
int insertCount = _db.Ado.ExecuteCommand(sqlStr);
@@ -2390,11 +2556,11 @@
string sqlStr2 = $"delete from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
_db.Ado.ExecuteCommand(sqlStr2);
}
-
+
// 鍚慦MS鐢宠宸烽亾
var http = new HttpService();
string TaskNo = "", EndLocate = "";
- string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo,palletNo, checkTaskMedel.BoxCount.ToDecimal(),"0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "","", boxInfoList,
+ string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo, palletNo, checkTaskMedel.BoxCount.ToDecimal(), "0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "", "", boxInfoList,
modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
if (strMsg.Contains("-1"))
{
@@ -2446,7 +2612,7 @@
{
// 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
- if (retVal.IsSucceed)
+ if (retVal.IsSucceed)
{
// 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
taskModel.Status = TaskStatusEnum.Doing;
@@ -2476,8 +2642,8 @@
}
}
break;
- default:break;
- }
+ default: break;
+ }
}
}
@@ -2493,7 +2659,8 @@
switch (modDevice.Value.ToString())
{
case "10"://10 plc璇锋眰wcs璇绘墭鐩樼爜 20 wcs璇诲彇ok wcs 鍐欏叆鏁伴噺鍙婅鏍� 30
- var strMsg = "";
+
+ //wcs璇诲彇ok20
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
if (ret.IsSucceed)
{
@@ -2539,6 +2706,7 @@
// 鏄惁鍐欏叆鎴愬姛
if (listResult.All(s => s.IsSucceed))
{
+ //wcs 鍐欏叆鏁伴噺鍙婅鏍� 30
var ret1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
}
@@ -2550,89 +2718,9 @@
}
}
}
-
- break;
- default:
- break;
+ break;
}
- }
- else
- {
- switch (modDevice.Value.ToString())
- {
- case "1":
- // 1妤间欢绠盤LC璇锋眰WCS璇荤爜
- {
- // 璇诲彇plc绠辩爜
- var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "涓绘壂鏉＄爜");
- var (res, boxNo) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
- if (string.IsNullOrWhiteSpace(boxNo.ToString()))
- {
-
- // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
- var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "0");
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
- break;
- }
- }
- }
- else
- {
- // 绠辩爜
- string boxNoVal = boxNo.ToString();
- // 閫氶亾鍙�
- var modLineNo = modDevice.listStation.FirstOrDefault(m => m.Text == "閫氶亾鍙�");
-
- // 璋冪敤wms鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�
- var http = new HttpService();
- RequestloadingAddre requesModel = http.ResultBoxInfoExportWcs(boxNoVal);
- if (requesModel.Success != "0")
- {
- // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
- var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, "0");
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- Log.Error("鍑哄簱鍒嗘嫞鏍规嵁绠辩爜鑾峰彇瑁呰溅鍙ｅけ璐ワ紝杩涜鍓旈櫎銆�" + requesModel.Message);
- break;
- }
- }
- }
- else
- {
- // 鍐欏叆鍑哄簱鍒嗛亾鍙�
- var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- break;
- }
- }
- }
- }
- };break;
- case "10":
- // 1妤间欢绠盤LC璇荤爜澶辫触锛學CS涓嶅仛澶勭悊鐩存帴鍓旈櫎鎵嬫寔鎷ｈ揣銆�
- {
-
- };break;
- default:
- break;
- }
- }
-
+ }
}
/// <summary>
--
Gitblit v1.8.0