From 7d9d48cf1e9d5b28e59ea52a0ee1acdfd15f88e7 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期二, 07 一月 2025 08:32:34 +0800
Subject: [PATCH] 问题修改
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 622 +++++++++-----------------------------------
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 2
Admin.NET/WCS.Application/Util/HttpService.cs | 113 +++++--
Admin.NET/WCS.Application/PLC/PLCUtil.cs | 13
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 1
Admin.NET/WCS.Application/Model/TaskRequest.cs | 56 ++++
6 files changed, 273 insertions(+), 534 deletions(-)
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index 8fad529..7c5a21d 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -464,4 +464,60 @@
/// </summary>
public string Message { get; set; }
}
+public class IsBaleModel2
+{
+ /// <summary>
+ /// 鐘舵�佺爜 0鎴愬姛 -1锛氬け璐�
+ /// </summary>
+ public int Success { get; set; }
+ /// <summary>
+ /// 鎻愮ず淇℃伅
+ /// </summary>
+ public string Message { get; set; }
+}
+public class RequestBoxInfoCheckAll
+{
+ public string Success { get; set; }
+ public string Message { get; set; }
+ public List<RequestBoxInfoCheck> list { get; set; }
+}
+public class RequestBoxInfoCheck
+{
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+ /// <summary>
+ /// 鎵规
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
+ /// 鎷嗙鏁伴噺
+ /// </summary>
+ public int? Qty { get; set; }
+ /// <summary>
+ /// 鎵樼洏涓婃�荤鏁�
+ /// </summary>
+ public int? QtyCount { get; set; }
+}
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 467a690..98397c0 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -145,7 +145,7 @@
}
/// <summary>
- /// WCS鎺ユ敹WMS涓嬪彂鐨勫叆搴撳崟浠诲姟
+ /// WCS鎺ユ敹WMS涓嬪彂鐨勫嚭鍏ュ簱鍗曚换鍔�
/// </summary>
/// <param name="models"></param>
/// <returns></returns>
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 363e793..1b9e99f 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -47,7 +47,7 @@
BoxConveyorLine(mod); // 鐮佸灈鏈哄櫒浜�
break;
case PLCTypeEnum.StackingRobot:
- PalletMachine(mod);
+ StackingRobot(mod); //鎷嗗灈鏈哄櫒浜�
break;
default:
break;
@@ -1049,14 +1049,14 @@
//鍒ゆ柇鏄惁瑁瑰寘
var gbPos = modDevice.listStation.FirstOrDefault(s => s.Text == "Element_1");
strMsg = new HttpService().RequestPackWcs(palletVal);
- if (IsBale == "1")
+ if (strMsg == "1")
{
//鍐欏叆瑁瑰寘鎸囦护
- ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, gbPos.PlcPos, "2");
+ ret = plcConn.SetPlcDBValue(gbPos.PosType, modDevice.DbNumber, gbPos.PlcPos, "2");
}
else
{
- ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, gbPos.PlcPos, "1");
+ ret = plcConn.SetPlcDBValue(gbPos.PosType, modDevice.DbNumber, gbPos.PlcPos, "1");
}
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
@@ -1648,17 +1648,18 @@
#endregion
case "10":
{
- #region 缂犺啘瀹屾垚 11
+ #region 缂犺啘瀹屾垚
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
var strMsg = "";
var http = new HttpService();
var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ //鍚慦MS鍙嶉鎵樼洏缂犺啘瀹屾垚
strMsg = http.RequestPackedWcs(palletVal);
if (!strMsg.Contains("-1"))
{
- var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "11");
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "11");//鏀跺埌缂犺啘瀹屾垚11
if (ret.IsSucceed)
{
// 鎻掑叆浠诲姟鏄庣粏
@@ -1684,12 +1685,25 @@
break;
case "20":
{
- #region 鏄惁鎷嗚啘 21锛氬惁 22锛氭槸 //23锛氫汉宸ユ媶
+ #region 鏄惁鎷嗚啘 21锛氬惁 22锛氭槸
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
var strMsg = "";
var http = new HttpService();
var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�,鐩殑宸ヤ綅鏄�009鐨勫啀鍚慦MS鍙戝嚭鎷嗚啘鐢宠
+ if (res1.IsSucceed)
+ {
+ string tasknoVal = val.ToString();
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+ if (modTask == null)
+ {
+ break;
+ }
+ }
strMsg = http.RequestUnPackWcs(palletVal);
if (!strMsg.Contains("-1"))
@@ -1786,7 +1800,7 @@
{
var plcConn = modDevice.PLCUtil;
- if (modDevice.DbNumber == "DB101")
+ if (modDevice.DbNumber == "DB101" && modDevice.DbNumber == "DB102")
{
// 涓绘壂浜や簰娴佺▼
switch (modDevice.Value.ToString())
@@ -1883,6 +1897,16 @@
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
if (retVal.IsSucceed)
{
+ if (modDevice.DbNumber == "DB102")//1L鎷嗚泛鍒嗘嫞鍚庨渶瑕佸洖浼犵鐮�
+ {
+ var http = new HttpService();
+ IsBaleModel2 ret1 = http.RequestBoxno(boxNoVal);
+ if (ret1.Success == -1)
+ {
+ Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細"+boxNoVal);
+ break;
+ }
+ }
break;
}
}
@@ -1893,7 +1917,7 @@
break;
default: break;
}
- }
+ }
else
{
// 鎻掔爜浜や簰
@@ -2226,461 +2250,66 @@
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
if (ret.IsSucceed)
{
+ //鑾峰彇鎵樼洏鐮�
var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
var (res, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
- //鏍规嵁鎵樼洏鍙峰垽鏂綋鍓嶄换鍔¤〃涓槸鍚︽湁姝や换鍔�,浠诲姟鐢盬MS鍑哄簱鏃朵笅鍙�
- string palletno = Convert.ToString(palletVal);
- var taskInfo = _db.Queryable<WcsTask>().First(w => w.PalletNo == palletno && w.Status == TaskStatusEnum.Doing);
- if (taskInfo == null)
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ string tasknoVal = val.ToString();
+
+ // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
+ if (res1.IsSucceed)
{
- Log.Error(string.Format($"鍑哄簱浠诲姟鏈笅鍙戯紝璇蜂汉宸ュ鐞嗭紝鏃犳硶鎷嗗灈锛�"));
- break;
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+ if (modTask == null)
+ {
+ Log.Error(string.Format($"鍑哄簱浠诲姟鏈笅鍙戯紝璇蜂汉宸ュ鐞嗭紝鏃犳硶鎷嗗灈锛�"));
+ break;
+ }
+
+ //閫氳繃浠诲姟鍙峰拰鎵樼洏鍙峰悜WMS鐢宠姝ゆ墭鐩樼殑鎷嗗灈淇℃伅
+ var http = new HttpService();
+ RequestBoxInfoCheckAll tasklist = http.RequestBoxCheckinfo(palletVal, tasknoVal);
+ if (!tasklist.Success.Contains("-1"))
+ {
+ //鑾峰彇鎷嗗灈鐗╂枡鍝佺(闇�瑕佸鍔犵墿鏂欏垽鏂紝鍚屼竴涓墿鏂欏彿鍙兘浼氬嚭鐜颁笉鍚岀殑鐮佸灈瑙勫垯)
+ var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.list[0].SkuNo);
+ //涓嬪彂鎷嗘墭瑙勬牸锛屾媶绠辨暟鍜屾墭鐩樹笂鎬荤鏁帮紙涓嶇粦瀹氭満鍣ㄤ汉锛屾媶鍨涗换鍔′俊鎭彧涓嬪彂涓�娆★級
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ // 鑾峰彇鎵樼洏瑙勫垯
+ var Standard = modDevice.listStation.FirstOrDefault(m => m.Text == "瑙勬牸");
+ listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, tasklist.list[0].Standard));
+ //鎶撶鏁�
+ var qty = modDevice.listStation.FirstOrDefault(m => m.Text == "鎷嗙鏁伴噺");
+ listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.list[0].Qty.ToString()));
+ //鎬荤鏁�
+ var qtycount = modDevice.listStation.FirstOrDefault(m => m.Text == "鎬荤鏁�");
+ listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.list[0].QtyCount.ToString()));
+
+
+ // 鏄惁鍐欏叆鎴愬姛
+ if (listResult.All(s => s.IsSucceed))
+ {
+ var ret1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
+
+ }
+ else
+ {
+ Log.Error(string.Format($"鐮佸灈淇℃伅鏈啓鍏ワ紒鎵樼洏鍙凤細"+palletVal+"锛岀爜鍨涗綅锛�"+modDevice.StationNum));
+ break;
+ }
+ }
}
- //缁戝畾鏈哄櫒浜烘媶鍨涗綅浠诲姟
-
-
- //涓嬪彂鎷嗘墭瑙勬牸锛屾媶绠辨暟鍜屾墭鐩樹笂鎬荤鏁�
-
}
-
-
+
break;
default:
break;
}
}
- }
-
- /// <summary>
- /// 浠剁鎷嗗灈鍒嗘嫞
- /// </summary>
- /// <param name="modDevice"></param>
- private static async void BoxCheckConveyorLine(WcsDeviceDto modDevice)
- {
- var plcConn = modDevice.PLCUtil;
-
- if (modDevice.DbNumber == "DB101")
- {
- // 涓绘壂浜や簰娴佺▼
- switch (modDevice.Value.ToString())
- {
- case "1":
- // 涓绘壂鐢宠鍒嗛亾 wcs鍐欏叆2
- {
- // 鍒ゆ柇鏄惁婕旂ず妯″紡 true锛氭紨绀烘ā寮� false:鐢熶骇妯″紡
- if (PLCTaskAction.boDemo)
- {
- // 閫氶亾鍙�
- var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
-
- // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (!retVal.IsSucceed)
- {
- Log.Error("婕旂ず妯″紡鍐欏叆鍒嗛亾鍙峰け璐�!");
- break;
- }
- }
- }
- else
- {
- // 閫氶亾鍙�
- var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
-
- // 璇诲彇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()))
- {
- // 绠辩爜涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "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 boxInfo = _db.Queryable<WcsBoxInfo>().First(w => w.IsDelete == false && w.BoxNo == boxNoVal && string.IsNullOrEmpty(w.PalletNo));
- if (boxInfo == null)
- {
- // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
- break;
- }
- }
- }
- // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
- var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
- if (checkTaskInfo == null)
- {
- // 缁戝畾淇℃伅涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- Log.Error("绠辩爜鏈粦瀹氬垎鎷ｄ换鍔★紝杩涜鍓旈櫎銆�");
- break;
- }
- }
- }
- else
- {
- // 涓巔lc浜や簰鍐欏叆鍒嗛亾鍙峰拰娴佺▼鎺у埗瀛�
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, checkTaskInfo.LineNo);
- if (ret.IsSucceed)
- {
- // 鍐欏叆娴佺▼鎺у埗瀛� 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- break;
- }
- }
- }
- }
- }
- }
- break;
- default: break;
- }
- }
- else
- {
- // 鎻掔爜浜や簰
- switch (modDevice.Value.ToString())
- {
- case "1":
- // 鎵樼洏鏉＄爜鍙
- {
- // 鑾峰彇鎵樼洏鏉＄爜閰嶇疆
- var modPalletNo = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鏉＄爜");
- // 璇诲彇PLC鎵樼洏鏉＄爜鍙�
- var (res, palletVal) = plcConn.GetPlcDBValue(modPalletNo.PosType, modDevice.DbNumber, modPalletNo.PlcPos);
- string palletNo = palletVal.ToString();
- if (string.IsNullOrEmpty(palletNo))
- {
- Log.Error(string.Format("{0}锛岃鍙栫殑鎵樼洏鍙蜂负null", modDevice.Text));
- break;
- }
-
- // 鏍规嵁宸ヤ綅鍙峰皢鎵樼洏鍙蜂繚瀛樺湪鍒嗛亾琛�
- var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
- if (checkTaskMedel == null)
- {
- Log.Error(string.Format("鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栧垎閬撳け璐�!", modDevice.StationNum));
- break;
- }
- checkTaskMedel.PalletNo = palletNo;
- var rowCount = _db.Updateable(checkTaskMedel).ExecuteCommand();
- if (rowCount > 0)
- {
- // plc鍐欏叆璇诲彇鎴愬姛琛ㄧず 2
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
- if (retVal.IsSucceed)
- {
- // liudl 姝ゅ闇�娣诲姞
- // 閫氱煡鍒嗘嫞鐮佸灈椤垫洿鏂�
- }
- }
- }
- break;
- case "20":
- // 鐢宠鎻掔爜
- {
- // 鑾峰彇鎵樼洏鏉＄爜閰嶇疆
- var modAddCode = modDevice.listStation.FirstOrDefault(m => m.Text == "鎻掔爜缁撴灉");
- // 鍒ゆ柇鏄惁婕旂ず妯″紡 true锛氭紨绀烘ā寮� false:鐢熶骇妯″紡
- if (PLCTaskAction.boDemo)
- {
- // 婕旂ず妯″紡鐩存帴鍐欏叆鎻掔爜缁撴灉 1锛氭垚鍔�
- var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
- break;
- }
- 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))
- {
- 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)
- {
- Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮亄boxNo}涓嶅瓨鍦�!璇蜂汉宸ュ己鍒剁粨鎵广��");
- // 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
- var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
- break;
- }
- // 鑾峰彇褰撳墠鍒嗛亾鎵樼洏鍙�
- var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
- if (checkTaskMedel == null)
- {
- Log.Error(string.Format("鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栧垎閬撳け璐�!", modDevice.StationNum));
- break;
- }
- string palletNo = checkTaskMedel.PalletNo;
- if (string.IsNullOrEmpty(palletNo))
- {
- Log.Error(string.Format("鑾峰彇鐮佸灈宸ヤ綅{0}涓婄殑鎵樼洏鍙峰け璐ワ紒", modDevice.StationNum));
- break;
- }
- // 淇敼鎻掔爜琛�
- foreach (WcsBoxInfo item in boxInfo)
- {
- item.PalletNo = palletNo;
- item.UpdateTime = DateTime.Now;
- }
-
- var rowCount = _db.Updateable(boxInfo).ExecuteCommand();
- if (rowCount > 0)
- {
- // 鎻掔爜鎴愬姛
- var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
-
- //鏄惁缁撴壒绠�
- if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed)
- {
- // 瑙﹀彂缁撴壒 瑙ｇ粦鍒嗛亾
- AutoEndLot(boxInfo[0].LotNo, plcConn, "0");
- }
- }
- else
- {
- // 鎻掔爜澶辫触
- Log.Error($"绠辩爜{boxNo};鐮佸灈宸ヤ綅{modDevice.StationNum}锛屾彃鐮佸け璐ワ紝璇峰己鍒剁粨鎵�");
- var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
- if (retVal.IsSucceed)
- {
- // 瑙﹀彂缁撴壒 涓嶈В缁戝垎閬�
- AutoEndLot(boxInfo[0].LotNo, plcConn, "1");
- }
- }
- }
- }
- break;
- case "40":
- // 璇锋眰缁勬墭锛岀敵璇峰叆搴�
- {
- lock (OLock)
- {
- // 鏍规嵁宸ヤ綅鍙凤紝鑾峰彇鎵樼洏鍙�
- var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
- // 鏍规嵁宸ヤ綅鍙疯幏鍙� 鎵樼洏绾胯宸ヤ綅鍙风殑閰嶇疆淇℃伅
- var numModel = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId != modDevice.PlcId);
- var posModel = PLCTaskAction.plcPositions.First(m => m.DeviceId == numModel.Id && m.Text == "鐩殑宸ヤ綅" && m.IsDelete == false);
- if (checkTaskMedel == null)
- {
- 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;
- }
-
- // 鐮佸灈宸ヤ綅鎵樼洏鍙�
- string palletNo = checkTaskMedel.PalletNo;
-
- // 鏄惁婕旂ず妯″紡
- if (PLCTaskAction.boDemo)
- {
- // 鐩存帴绠眞ms鐢宠宸烽亾
- var http = new HttpService();
- string TaskNo = "", EndLocate = "";
- string strMsg = http.RequestRoadWay(palletNo, modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
- if (strMsg.Contains("-1"))
- {
- Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
- break;
- }
- 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)
- {
- // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
- string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
-
- var listResult = new List<Result>();
-
- // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue)); // 鐩爣宸ヤ綅
- var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟鍙�" && s.IsDelete == false);
- listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
- var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟绫诲瀷" && s.IsDelete == false);
- var taskTypeStr = (int)taskModel.TaskType;
- listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
-
- if (listResult.All(s => s.IsSucceed))
- {
- // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
- var retVal1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
- if (retVal1.IsSucceed)
- {
- // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
- taskModel.Status = TaskStatusEnum.Doing;
- _db.Updateable(taskModel).ExecuteCommand();
-
- // 鎻掑叆浠诲姟鏄庣粏
- var modInsertTaskMonitor = new WcsTaskMonitor()
- {
- TaskNo = TaskNo,
- PlcId = modDevice.Id,
- PlcName = modDevice.Text,
- InteractiveMsg = $"鍐欏叆鎸囦护50锛氱敵璇峰贩閬撴垚鍔�",
- PalletNo = palletNo,
- Status = TaskStatusEnum.Complete,
- StartLocat = modDevice.StationNum,
- EndLocat = strMsg,
- };
- // 鎻掑叆浜や簰鏃ュ織
- _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
- // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
- HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- }
- }
-
- //// 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- //var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
- //if (retVal.IsSucceed)
- //{
- // // 鍐欏叆鐮佸灈浜や簰-缁勬墭鍥炲娴佺▼瀛�
- // retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
-
- // // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
- // taskModel.Status = TaskStatusEnum.Doing;
- // _db.Updateable(taskModel).ExecuteCommand();
- //}
- }
- }
- }
- else
- {
- // 鏍规嵁鎵樼洏鍙凤紝灏嗙粍鎵樹俊鎭彃鍏oxinfolog琛� 骞跺垹闄oxinfo琛ㄦ暟鎹�
- var boxInfoList = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.PalletNo == palletNo).ToList();
- if (boxInfoList.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;
- }
- string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
- int insertCount = _db.Ado.ExecuteCommand(sqlStr);
- if (insertCount > 0)
- {
- // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
- string sqlStr2 = $"delete from WCSBoxInfoLog 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,
- modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
- if (strMsg.Contains("-1"))
- {
- Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
- break;
- }
- else
- {
- // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
- var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
- if (taskModel != null)
- {
- // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
- string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
-
- var listResult = new List<Result>();
- // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
- listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue)); // 鐩爣宸ヤ綅
- var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟鍙�" && s.IsDelete == false);
- listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
- var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟绫诲瀷" && s.IsDelete == false);
- var taskTypeStr = (int)taskModel.TaskType;
- listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
-
- if (listResult.All(s => s.IsSucceed))
- {
- // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
- var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
- if (retVal.IsSucceed)
- {
- // 灏嗗叆搴撲换鍔＄敱姝ｅ湪鎵ц鏀逛负姝ｅ湪鎵ц
- taskModel.Status = TaskStatusEnum.Doing;
- _db.Updateable(taskModel).ExecuteCommand();
-
- // 鎻掑叆浠诲姟鏄庣粏
- var modInsertTaskMonitor = new WcsTaskMonitor()
- {
- TaskNo = TaskNo,
- PlcId = modDevice.Id,
- PlcName = modDevice.Text,
- InteractiveMsg = $"鍐欏叆鎸囦护50锛氱敵璇峰贩閬撴垚鍔�",
- PalletNo = palletNo,
- Status = TaskStatusEnum.Complete,
- StartLocat = modDevice.StationNum,
- EndLocat = strMsg,
- };
- // 鎻掑叆浜や簰鏃ュ織
- _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
- // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
- HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- }
- }
- }
- }
- }
- }
- }
- break;
- default: break;
- }
- }
+
}
/// <summary>
@@ -2776,52 +2405,53 @@
private static void Test(WcsDeviceDto modDevice)
{
- //鍐欐娴嬭瘯璇籹tring
- var (res, val) = modDevice.PLCUtil.GetPlcDBValue(PLCDataTypeEnum.String, "DB100", "64");
- Console.WriteLine("DB100.64----" + val);
- //娴嬭瘯鎵归噺璇诲彇
- Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
- foreach (var modStation in modDevice.listStation)
- {
- listaddress.Add(modStation.PlcPos, modStation.PosType);
- }
- var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
- if (result.Value.Count > 0)
- {
- foreach (var value in result.Value)
- {
- Console.WriteLine("鍦板潃" + value.Key + "----鍊�" + value, value);
- }
- }
- if (!result.IsSucceed)
- {
- foreach (var err in result.ErrList)
- {
- Console.WriteLine(err);
- }
- if (result.Value.Count > 0)//鏈夐敊璇殑涔熸湁鎴愬姛鐨�
- {
+ //var strMsg = new HttpService().RequestPackWcs("LN000001");
+ ////鍐欐娴嬭瘯璇籹tring
+ //var (res, val) = modDevice.PLCUtil.GetPlcDBValue(PLCDataTypeEnum.String, "DB100", "64");
+ //Console.WriteLine("DB100.64----" + val);
+ ////娴嬭瘯鎵归噺璇诲彇
+ //Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
+ //foreach (var modStation in modDevice.listStation)
+ //{
+ // listaddress.Add(modStation.PlcPos, modStation.PosType);
+ //}
+ //var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
+ //if (result.Value.Count > 0)
+ //{
+ // foreach (var value in result.Value)
+ // {
+ // Console.WriteLine("鍦板潃" + value.Key + "----鍊�" + value, value);
+ // }
+ //}
+ //if (!result.IsSucceed)
+ //{
+ // foreach (var err in result.ErrList)
+ // {
+ // Console.WriteLine(err);
+ // }
+ // if (result.Value.Count > 0)//鏈夐敊璇殑涔熸湁鎴愬姛鐨�
+ // {
- }
- }
- if (modDevice.Value == 820)
- {
- //娴嬭瘯鍐欏叆830
- //var result = mod.PLCUtil.SetPlcDBValue(mod.PosType.Value, mod.DbNumber, mod.PlcPos, "830");
- ////鍐欏叆鏄惁鎴愬姛
- //if (result.IsSucceed)
- //{
+ // }
+ //}
+ //if (modDevice.Value == 820)
+ //{
+ // //娴嬭瘯鍐欏叆830
+ // //var result = mod.PLCUtil.SetPlcDBValue(mod.PosType.Value, mod.DbNumber, mod.PlcPos, "830");
+ // ////鍐欏叆鏄惁鎴愬姛
+ // //if (result.IsSucceed)
+ // //{
- //}
- }
- else if (modDevice.Value == 840)
- {
+ // //}
+ //}
+ //else if (modDevice.Value == 840)
+ //{
- }
- else if (modDevice.Value == 860)
- {
+ //}
+ //else if (modDevice.Value == 860)
+ //{
- }
+ //}
}
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 390cd4c..3a30f2c 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -69,6 +69,7 @@
/// </summary>
public static void Init()
{
+ // var strMsg = new HttpService().RequestPackWcs("LN000001");
cts.Cancel();
listPlc = _db.Queryable<WcsPlc>()
.Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine)
diff --git a/Admin.NET/WCS.Application/PLC/PLCUtil.cs b/Admin.NET/WCS.Application/PLC/PLCUtil.cs
index 0421e04..b771e4e 100644
--- a/Admin.NET/WCS.Application/PLC/PLCUtil.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCUtil.cs
@@ -225,6 +225,19 @@
address = DbNumber + Pos;
return this.SetPlcDBValue(PosType, address, Value);
}
+
+ /// <summary>
+ /// 鍐欏叆PLC鍊�
+ /// </summary>
+ //public IoTClient.Result SetPlcDBValue(PLCDataTypeEnum PosType, string DbNumber, string Pos, byte Value)
+ //{
+ // string address;
+ // if (DbNumber.StartsWith("DB"))
+ // address = DbNumber + "." + Pos;
+ // else
+ // address = DbNumber + Pos;
+ // return this.SetPlcDBValue(PosType, address, Value);
+ //}
/// <summary>
/// 鍐欏叆PLC鍊�
/// </summary>
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 256fcc5..0d79375 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -35,7 +35,7 @@
public string RequestRoadWay(string palletNo, string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
{
string returnStr = "";
-
+
var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo);
@@ -49,11 +49,11 @@
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
- var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
if (result.Success == 0)
{
-
+
var taskAdd = new WcsTask()
{
TaskType = TaskTypeEnum.In,
@@ -66,12 +66,12 @@
EndLocate = result.TaskList.EndLocate,
EndRoadway = result.TaskList.EndRoadway
};
-
+
_db.Insertable(taskAdd).ExecuteCommand();
endLocat = result.TaskList.EndRoadway;
taskNo = result.TaskList.TaskNo;
returnStr = result.TaskList.EndLocate;
-
+
}
else
{
@@ -95,7 +95,7 @@
/// 璋冪敤WMS鎺ュ彛鑷姩鐮佸灈缁戝畾淇℃伅杩斿洖宸烽亾鍙�
/// </summary>
/// <returns></returns>
- public string BindRequestRoadWay(string orderNo, string palletNo,decimal qty ,string type,string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
+ public string BindRequestRoadWay(string orderNo, string palletNo, decimal qty, string type, string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
{
string returnStr = "";
@@ -105,17 +105,17 @@
{
var model = new BoxPalletBindVm()
{
- OrderCode= "",//鏆傛棤涓婃父绯荤粺缂栧彿
- AsnNo= orderNo,
- AsnDetailNo=0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
- PalletNo=palletNo,
- Qty= qty,
- Type=type,
- SkuNo=skuNo,
- LotNo= lotNo,
- LotText= lotText,
- SupplierLot= supplierLot,
- Detail=detail
+ OrderCode = "",//鏆傛棤涓婃父绯荤粺缂栧彿
+ AsnNo = orderNo,
+ AsnDetailNo = 0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
+ PalletNo = palletNo,
+ Qty = qty,
+ Type = type,
+ SkuNo = skuNo,
+ LotNo = lotNo,
+ LotText = lotText,
+ SupplierLot = supplierLot,
+ Detail = detail
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
@@ -169,8 +169,8 @@
string returnStr = "";
- var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false
- && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing)
+ var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false
+ && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing)
&& m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo && !string.IsNullOrWhiteSpace(m.EndLocate));
if (task == null)
@@ -214,7 +214,7 @@
HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
}
-
+
returnStr = result.TaskList.EndLocate;
taskNo = result.TaskList.TaskNo;
}
@@ -259,9 +259,10 @@
//string TaskStatus = "";
//var PalletNo = "";
//var TaskNo = "";
- var str = new {
+ var str = new
+ {
PalletNo = model.PalletNo,
- TaskNo=model.TaskNo,
+ TaskNo = model.TaskNo,
TaskType = model.TaskType.ToString(),
TaskStatus = model.TaskStatus.ToString(),
};
@@ -296,7 +297,7 @@
/// <param name="Num"></param>
/// <param name="OutMode"></param>
/// <returns></returns>
- public string IssuePlnOutHouseWcs(string Num,string OutMode)
+ public string IssuePlnOutHouseWcs(string Num, string OutMode)
{
string returnStr = "";
@@ -324,7 +325,7 @@
//IsSuccess =TaskSuccessEnum.Success,
Origin = "WMS",
StartLocate = item.StartLocate,
- StartRoadway=item.StartRoadway,
+ StartRoadway = item.StartRoadway,
PalletNo = item.PalletNo,
EndLocate = item.EndLocate,
EndRoadway = item.EndRoadway
@@ -382,21 +383,22 @@
}
/// <summary>
- /// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘寮傚父鎺ュ彛
+ /// 璋冪敤WMS鎺ュ彛鍙嶉鐢宠缂犺啘鎺ュ彛
/// </summary>
/// <param name="PalletNo">鎵樼洏鍙�</param>
/// <returns></returns>
public string RequestPackWcs(string PalletNo)
{
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
- //var str = new
- //{
- // PalletNo = palletno
- //};
- var result = (url + "/api/DownAPi/RequestPackWcs").SetBody(PalletNo, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
- Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘寮傚父鎺ュ彛" + result.ToJson());
-
- return result.Success;
+ var str = new PackModel()
+ {
+ PalletNo = PalletNo
+ };
+
+ var result = (url + "/api/DownAPi/RequestPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鐢宠缂犺啘寮傚父鎺ュ彛" + result.ToJson());
+
+ return result.Success.ToString();
}
/// <summary>
@@ -411,9 +413,9 @@
{
PalletNo = palletno
};
- var result = (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ var result = (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
- return result.Success;
+ return result.Success.ToString();
}
/// <summary>
@@ -428,9 +430,46 @@
{
PalletNo = palletno
};
- var result = (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ var result = (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚寮傚父鎺ュ彛" + result.ToJson());
- return result.Success;
+ return result.Success.ToString();
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉鎷嗗灈鎵樼洏淇℃伅
+ /// </summary>
+ /// <param name="palletno">鎵樼洏鍙�</param>
+ /// <param name="taskno">浠诲姟鍙�</param>
+ /// <returns></returns>
+ public RequestBoxInfoCheckAll RequestBoxCheckinfo(string palletno,string taskno)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ PalletNo = palletno,
+ TaskNo = taskno
+ };
+ var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestBoxInfoCheckAll>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗘墭鎵樼洏淇℃伅寮傚父鎺ュ彛" + result.ToJson());
+ return result;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉鍒嗘嫞鍑哄簱绠变俊鎭�
+ /// </summary>
+ /// <param name="palletno">鎵樼洏鍙�</param>
+ /// <param name="taskno">浠诲姟鍙�</param>
+ /// <returns></returns>
+ public IsBaleModel2 RequestBoxno(string palletno)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ PalletNo = palletno,
+ };
+ var result = (url + "/api/DownAPi/RequestBoxno").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚寮傚父鎺ュ彛" + result.ToJson());
+ return result;
}
}
--
Gitblit v1.8.0