From 01cc5773457f68274ef1b2d9d9daca8983761828 Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期四, 05 六月 2025 17:33:03 +0800
Subject: [PATCH] 佳通bug优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs | 24 ++
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/WmsController.cs | 6
/dev/null | 0
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/ApiHelper.cs | 45 ++---
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/wms/WMSHelper.cs | 24 +-
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/wms/WCSHelper.cs | 4
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/process/TaskProcess.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs | 3
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs | 5
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjXcTask.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/v17/DocumentLayout.json | 24 +++
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/config/config.json | 170 +++++++++++++++---------
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/TransfeRelevance.cs | 18 +-
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjMesTask.cs | 2
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/HH.WCS.Mobox3.FJJT.sln | 46 +++++
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LogicConfig.cs | 14 +-
17 files changed, 243 insertions(+), 148 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/5cf5465c-9dee-4acf-a295-4a31ca90c995.vsidx b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/5cf5465c-9dee-4acf-a295-4a31ca90c995.vsidx
deleted file mode 100644
index a66628c..0000000
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/5cf5465c-9dee-4acf-a295-4a31ca90c995.vsidx
+++ /dev/null
Binary files differ
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/6dfcbcd2-e6c6-442b-a368-81c6e80ee21a.vsidx b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/6dfcbcd2-e6c6-442b-a368-81c6e80ee21a.vsidx
deleted file mode 100644
index a8ed667..0000000
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/6dfcbcd2-e6c6-442b-a368-81c6e80ee21a.vsidx
+++ /dev/null
Binary files differ
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/ca9c19c4-0ec8-4ea4-9dcd-27b9894ec17e.vsidx b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/ca9c19c4-0ec8-4ea4-9dcd-27b9894ec17e.vsidx
deleted file mode 100644
index e6bc6a1..0000000
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/FileContentIndex/ca9c19c4-0ec8-4ea4-9dcd-27b9894ec17e.vsidx
+++ /dev/null
Binary files differ
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/v17/DocumentLayout.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/v17/DocumentLayout.json
index c818d74..2557594 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/v17/DocumentLayout.json
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/.vs/HH.WCS.Mobox3.FJJT/v17/DocumentLayout.json
@@ -1,7 +1,12 @@
{
"Version": 1,
- "WorkspaceRootPath": "F:\\hanhe\\YNJT\\HH.WCS.Mobox3\\HH.WCS.Mobox3.FJJT\\",
- "Documents": [],
+ "WorkspaceRootPath": "F:\\hanhe\\WMS\\HH-0127_YinNiJiaTong\\HH.WCS.Mobox3\\HH.WCS.Mobox3.FJJT\\",
+ "Documents": [
+ {
+ "AbsoluteMoniker": "D:0:0:{0809739B-B9DF-4757-86FE-045EB5D44798}|HH.WCS.Mobox3.FJJT.csproj|f:\\hanhe\\wms\\hh-0127_yinnijiatong\\hh.wcs.mobox3\\hh.wcs.mobox3.fjjt\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0809739B-B9DF-4757-86FE-045EB5D44798}|HH.WCS.Mobox3.FJJT.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ }
+ ],
"DocumentGroupContainers": [
{
"Orientation": 0,
@@ -9,7 +14,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": -1,
+ "SelectedChildIndex": 5,
"Children": [
{
"$type": "Bookmark",
@@ -30,6 +35,19 @@
{
"$type": "Bookmark",
"Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "WmsController.cs",
+ "DocumentMoniker": "F:\\hanhe\\WMS\\HH-0127_YinNiJiaTong\\HH.WCS.Mobox3\\HH.WCS.Mobox3.FJJT\\api\\WmsController.cs",
+ "RelativeDocumentMoniker": "api\\WmsController.cs",
+ "ToolTip": "F:\\hanhe\\WMS\\HH-0127_YinNiJiaTong\\HH.WCS.Mobox3\\HH.WCS.Mobox3.FJJT\\api\\WmsController.cs",
+ "RelativeToolTip": "api\\WmsController.cs",
+ "ViewState": "AQIAAAAAAAAAAAAAAADwvwAAAAAAAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-06-04T09:30:35.38Z",
+ "EditorCaption": ""
}
]
},
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/HH.WCS.Mobox3.FJJT.sln b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/HH.WCS.Mobox3.FJJT.sln
index effa4fe..004d1a2 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/HH.WCS.Mobox3.FJJT.sln
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/HH.WCS.Mobox3.FJJT.sln
@@ -3,11 +3,23 @@
# Visual Studio Version 17
VisualStudioVersion = 17.10.35013.160
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.FJJT", "HH.WCS.Mobox3.FJJT.csproj", "{E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.FJJT", "HH.WCS.Mobox3.FJJT.csproj", "{0809739B-B9DF-4757-86FE-045EB5D44798}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.HD", "..\HH.WCS.Mobox3.HD\HH.WCS.Mobox3.HD.csproj", "{44207EA0-2B75-4387-8A15-5C3D70A73C20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.TSSG", "..\HH.WCS.Mobox3.TSSG\HH.WCS.Mobox3.TSSG.csproj", "{8ACEE926-6897-4380-BF9D-9A443FEE6A6F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.SXJK", "..\HH.WCS.Mobox3.SXJK\HH.WCS.Mobox3.SXJK.csproj", "{F6E51E0D-CCFD-44AD-AF62-B741F33C0E28}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.Template", "..\HH.WCS.Mobox3.Template\HH.WCS.Mobox3.Template.csproj", "{E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.YNJT_BZP", "..\HH.WCS.Mobox3.YNJT_BZP\HH.WCS.Mobox3.YNJT_BZP.csproj", "{0B722ABA-0915-419D-BE61-84AE033AE5B0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.YNJT_BZP_GT", "..\HH.WCS.Mobox3.YNJT_BZP_GT\HH.WCS.Mobox3.YNJT_BZP_GT.csproj", "{82699D04-CB3F-4511-8CCF-08FA3730BB11}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.YNJT_PT", "..\HH.WCS.Mobox3.YNJT_PT\HH.WCS.Mobox3.YNJT_PT.csproj", "{344FD924-1B98-4B91-942B-619A1ADE8C5E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.Mobox3.ZS7412", "..\HH.WCS.Mobox3.ZS7412\HH.WCS.Mobox3.ZS7412.csproj", "{FFBB13EB-B1BC-45EC-922E-1B3AA642622A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,10 +27,10 @@
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0809739B-B9DF-4757-86FE-045EB5D44798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0809739B-B9DF-4757-86FE-045EB5D44798}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0809739B-B9DF-4757-86FE-045EB5D44798}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0809739B-B9DF-4757-86FE-045EB5D44798}.Release|Any CPU.Build.0 = Release|Any CPU
{44207EA0-2B75-4387-8A15-5C3D70A73C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{44207EA0-2B75-4387-8A15-5C3D70A73C20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{44207EA0-2B75-4387-8A15-5C3D70A73C20}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -27,6 +39,30 @@
{8ACEE926-6897-4380-BF9D-9A443FEE6A6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8ACEE926-6897-4380-BF9D-9A443FEE6A6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8ACEE926-6897-4380-BF9D-9A443FEE6A6F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F6E51E0D-CCFD-44AD-AF62-B741F33C0E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F6E51E0D-CCFD-44AD-AF62-B741F33C0E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F6E51E0D-CCFD-44AD-AF62-B741F33C0E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F6E51E0D-CCFD-44AD-AF62-B741F33C0E28}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E98DD345-9B0E-46C8-B0AB-20B99B5ACAEA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0B722ABA-0915-419D-BE61-84AE033AE5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0B722ABA-0915-419D-BE61-84AE033AE5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0B722ABA-0915-419D-BE61-84AE033AE5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0B722ABA-0915-419D-BE61-84AE033AE5B0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {82699D04-CB3F-4511-8CCF-08FA3730BB11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {82699D04-CB3F-4511-8CCF-08FA3730BB11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {82699D04-CB3F-4511-8CCF-08FA3730BB11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {82699D04-CB3F-4511-8CCF-08FA3730BB11}.Release|Any CPU.Build.0 = Release|Any CPU
+ {344FD924-1B98-4B91-942B-619A1ADE8C5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {344FD924-1B98-4B91-942B-619A1ADE8C5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {344FD924-1B98-4B91-942B-619A1ADE8C5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {344FD924-1B98-4B91-942B-619A1ADE8C5E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FFBB13EB-B1BC-45EC-922E-1B3AA642622A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFBB13EB-B1BC-45EC-922E-1B3AA642622A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FFBB13EB-B1BC-45EC-922E-1B3AA642622A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FFBB13EB-B1BC-45EC-922E-1B3AA642622A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/ApiHelper.cs
index 3ec4343..e51ab71 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/ApiHelper.cs
@@ -813,7 +813,7 @@
return responseResult;
}
- middleLoc = WMSHelper.GetMinTaskTransfeLoc(startLoc.S_AREA_CODE, "1", "2");
+ middleLoc = WMSHelper.GetMinTaskTransfeLoc(startLoc.S_AREA_CODE, 2 , 2);
if (middleLoc == null) {
WMSHelper.addAlarmRecord("娴佺▼寮傚父", "楂�, $"MES鍙枡浠诲姟{mesTask.ID},绔嬪簱鎺ラ┏浣嶅彲鑳藉浜庨攣瀹氭垨绂佺敤鐘舵�锛岃鏌ョ湅");
responseResult.code = 1;
@@ -1238,7 +1238,7 @@
wmsEndLoc = WMSHelper.getInStockEndLoc(null, container.N_DETAIL_COUNT == 0 ? 0 : 1, container.N_TYPE);
if (wmsEndLoc != null)
{
- agvEndLoc = WMSHelper.GetMinTaskTransfeLoc(wmsEndLoc.S_AREA_CODE, "1", "1", "2"); // 1.绔嬪簱鎺ラ┏浣�1.鍏ュ簱 2.闈炵洿杩�+ agvEndLoc = WMSHelper.GetMinTaskTransfeLoc(wmsEndLoc.S_AREA_CODE, 1, 2); // 1.绔嬪簱鎺ラ┏浣�1.鍏ュ簱 2.闈炵洿杩� if (agvEndLoc != null)
{
LogHelper.Info($"鍒涘缓绔嬪簱绔欏彴鍒扮珛搴撶殑棰勫垱寤轰换鍔★紝agv缁堢偣璐т綅:{agvEndLoc.S_CODE},绔嬪簱缁堢偣璐т綅:{wmsEndLoc.S_CODE}", "AGV");
@@ -1314,7 +1314,7 @@
wmsEndLoc = WMSHelper.getInStockEndLoc(null, container.N_DETAIL_COUNT == 0 ? 0 : 1, container.N_TYPE);
if (wmsEndLoc != null)
{
- agvEndLoc = WMSHelper.GetMinTaskTransfeLoc(wmsEndLoc.S_AREA_CODE, "1", "1", "2"); // 1.绔嬪簱鎺ラ┏浣�1.鍏ュ簱 2.闈炵洿杩�+ agvEndLoc = WMSHelper.GetMinTaskTransfeLoc(wmsEndLoc.S_AREA_CODE, 1, 2); // 1.绔嬪簱鎺ラ┏浣�1.鍏ュ簱 2.闈炵洿杩� if (agvEndLoc != null)
{
LogHelper.Info($"鍒涘缓绔嬪簱绔欏彴鍒扮珛搴撶殑棰勫垱寤轰换鍔★紝agv缁堢偣璐т綅:{agvEndLoc.S_CODE},绔嬪簱缁堢偣璐т綅:{wmsEndLoc.S_CODE}", "AGV");
@@ -1448,7 +1448,7 @@
}
}
- middleLoc = WMSHelper.GetTransfeRelevanceLoc(startLoc.S_AREA_CODE, "1" , "2");
+ middleLoc = WMSHelper.GetTransfeRelevanceLoc(startLoc.S_AREA_CODE, 1 , 2);
if (middleLoc != null)
{
@@ -1680,7 +1680,7 @@
wmsEndLoc = WMSHelper.getInStockEndLoc(null, container.N_DETAIL_COUNT == 0 ? 0 : 1, container.N_TYPE);
if (wmsEndLoc != null)
{
- agvEndLoc = WMSHelper.GetMinTaskTransfeLoc(wmsEndLoc.S_AREA_CODE, "1", "1", "2"); // 1.绔嬪簱鎺ラ┏浣�1.鍏ュ簱 2.闈炵洿杩�+ agvEndLoc = WMSHelper.GetMinTaskTransfeLoc(wmsEndLoc.S_AREA_CODE, 1, 2); // 1.绔嬪簱鎺ラ┏浣�1.鍏ュ簱 2.闈炵洿杩� if (agvEndLoc != null)
{
// 棰勫厛鐢熸垚鍏ュ簱绔欏彴-绔嬪簱缁堢偣鐨勬惉杩愪换鍔�@@ -2025,41 +2025,32 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public static bool switchStationAttribute(SwitchStationAttributeModel model)
+ public static ResponseResult switchStationAttribute(SwitchStationAttributeModel model)
{
- bool result = false;
+ ResponseResult responseResult = new ResponseResult();
var task = WCSHelper.GetTaskByStartOrEnd(model.locCode);
- if (task == null)
+ if (task == null)
{
- var transfeRelevance= WMSHelper.GetTransfeRelevance(model.locCode); // 鎺ラ┏浣嶅睘鎬�+ var transfeRelevance = WMSHelper.GetTransfeRelevance(model.locCode); // 鎺ラ┏浣嶅睘鎬� LogHelper.Info($"鍘熺珯鍙板睘鎬э細{JsonConvert.SerializeObject(transfeRelevance)}", "WMS");
- if (transfeRelevance != null && transfeRelevance.S_TYPE == "1")
+ if (transfeRelevance != null && transfeRelevance.N_PROPERTY == 2)
{
if (model.signalType == "1")
{
- if (transfeRelevance.S_PROPERTY == "2")
- {
- result = true;
- }
- else
- {
- result = WMSHelper.updateTransfeLocProperty(model.locCode, "2");
- }
+ WMSHelper.updateTransfeLocProperty(model.locCode, 0);
}
if (model.signalType == "2")
{
- if (transfeRelevance.S_PROPERTY == "3")
- {
- result = true;
- }
- else
- {
- result = WMSHelper.updateTransfeLocProperty(model.locCode, "3");
- }
+ WMSHelper.updateTransfeLocProperty(model.locCode, 1);
}
}
}
- return result;
+ else
+ {
+ responseResult.code = 1;
+ responseResult.msg = "鎺ラ┏浣嶅瓨鍦ㄦ湭瀹屾垚鐨勪换鍔★紝鏃犳硶鍒囨崲绔欏彴灞炴�";
+ }
+ return responseResult;
}
/// <summary>
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/WmsController.cs
index efe4a8f..9aa224c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/api/WmsController.cs
@@ -199,11 +199,7 @@
{
LogHelper.Info("switchStationAttribute 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
ResponseResult result = new ResponseResult();
- var bo = ApiHelper.switchStationAttribute(model);
- if (!bo)
- {
- result.code = 201;
- }
+ result = ApiHelper.switchStationAttribute(model);
LogHelper.Info("switchStationAttribute 鍑哄弬锛� + JsonConvert.SerializeObject(result), "WMS");
return result;
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjMesTask.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjMesTask.cs
index 8a4a876..e58d017 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjMesTask.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjMesTask.cs
@@ -30,6 +30,8 @@
public string RECEIVE_DATE { get; set; } //璇诲彇鏃ユ湡 璇诲彇鍚庢洿鏂� public string EQP { get; set; } //鏈哄彴缂栧彿
public string PLAN_ID { get; set; } //璁″垝鍙�+ public string AWAIT_MSG { get; set; } // 绛夊緟娑堟伅
+ public bool IS_FINISH { get; set; } // 鏄惁瀹屾垚涓婃枡
public string RECEIVE_MSG { get; set; } //閿欒淇℃伅 閿欒鏃讹紝AGV鍐欏叆璇︾粏閿欒淇℃伅
}
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjXcTask.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjXcTask.cs
index 2a7f3b5..244f9e6 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjXcTask.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LjXcTask.cs
@@ -11,7 +11,7 @@
/// <summary>
/// WMS涓嬪彂浠诲姟琛� /// </summary>
- [SugarTable("TN_AGV_TASK")]
+ [SugarTable("TN_WMS_TASK")]
internal class LjXcTask : BaseModel
{
public int ID { get; set; } //涓婚敭
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LogicConfig.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LogicConfig.cs
index 2eb4e81..08cd58c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LogicConfig.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/LogicConfig.cs
@@ -10,15 +10,15 @@
[SugarTable("TN_WMS_Zone")]
public class LogicConfig : BaseModel
{
- public string S_JT_CODE { get; set; } //鏈哄彴鍙�- public string S_MTJBLOC { get; set; } //婊℃鍏ュ簱鎺ラ┏浣�
- public string S_JTBKLYLOC { get; set; } //鏈哄彴琛ョ┖鏉ユ簮浣�- public string S_LKBKHCLOC { get; set; } //琛ョ┖缂撳瓨浣�- public string S_LKKTJBLOC { get; set; } //琛ョ┖鎺ラ┏浣�- public string S_AREA_CODE { get; set; } //鍏宠仈绔嬪簱
+ public string S_JT_CODE { get; set; } //鏈哄彴鍙� 瀵瑰簲 MES涓嬪彂浠诲姟琛ㄩ噷鐨勬満鍙扮紪鍙�EQP
+ public string S_MTJBLOC { get; set; } //婊℃鍏ュ簱鎺ラ┏浣� 鐩磋繛/闈炵洿杩為兘鏄搴旂珛搴撳叆搴撴帴椹充綅
+ public string S_JTBKLYLOC { get; set; } //鏈哄彴琛ョ┖鏉ユ簮浣� 缂撳瓨浣�-> 鏈哄彴
+ public string S_LKBKHCLOC { get; set; } //绔嬪簱琛ョ┖缂撳瓨浣� 绔嬪簱 -> 缂撳瓨浣�+ public string S_LKKTJBLOC { get; set; } //绔嬪簱琛ョ┖鎺ラ┏浣� 鐩磋繛/闈炵洿杩為兘鏄搴旂珛搴撳嚭搴撴帴椹充綅
+ public string S_AREA_CODE { get; set; } //鍏宠仈绔嬪簱 鍑哄叆搴撳搴旂殑瀛樺偍绔嬪簱
public string S_TASK_TYPE { get; set; } //浠诲姟绫诲瀷 1.鑳庝晶鐩磋繛绫诲瀷 2.甯樺竷鐩磋繛绫诲瀷 3.闈炵洿杩炵被鍨� public string S_PRI { get; set; } //浼樺厛绾�- public string S_RG_LOC { get; set; } //鏄惁涓轰汉宸ヤ笅绾夸綅 鏄�鍚�+ public string S_RG_LOC { get; set; } //鏈哄彴鏄惁涓轰汉宸ヤ笅绾夸綅 鏄�鍚� 锛堜汉宸ヤ笅绾夸綅浠ｈ〃浜哄伐鏈哄彴琛ョ┖宸ヨ锛� public string S_ENABLE { get; set; } //鏄惁鍚敤 鏄�鍚�
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/TransfeRelevance.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/TransfeRelevance.cs
index a999f45..8325720 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/TransfeRelevance.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/models/TransfeRelevance.cs
@@ -10,16 +10,16 @@
/// <summary>
/// 绔嬪簱鎺ラ┏浣嶉厤缃〃
/// </summary>
- [SugarTable("TN_ConnectLoc_ReleArea")]
+ [SugarTable("TN_ShipmentLocConfig")]
internal class TransfeRelevance :BaseModel
{
- public string S_LOC_CODE { get; set; } // 绔嬪簱鎺ラ┏浣嶇紪鐮�- public string S_TYPE { get; set; } // 绫诲瀷 1.绔嬪簱鎺ラ┏浣�2.缂撳瓨浣�
- public string S_PROPERTY { get; set; } // 璐т綅灞炴� (1.鐩磋繛 2.闈炵洿杩炪�3.浜哄伐 銆�.鍥哄畾绔欏彴)
- public string S_ACT_TYPE { get; set; } // 鍔ㄤ綔绫诲瀷 0.榛樿 1.鍏ュ簱 2.鍑哄簱
- public string S_RELE_AREA { get; set; } // 鍏宠仈绔嬪簱搴撳尯缂栫爜
- public string S_DEVICE_NO { get; set; } // 璁惧鍙�- public int N_READ_LOC { get; set; } // 鏄惁璇荤爜浣�0銆佸惁 1.鏄�-
+ public string S_LOC_CODE { get; set; } // 璐т綅缂栫爜
+ public int N_PROPERTY { get; set; } // 璐т綅灞炴� (1.鐩磋繛 2.闈炵洿杩�
+ public int N_ACT_TYPE { get; set; } // 璐т綅绫诲瀷 1.鍏ュ簱鎺ラ┏浣�2.鍑哄簱鎺ラ┏浣�+ public string S_RELE_AREA { get; set; } // 鎵�睘搴撳尯
+ public string S_DEVICE_NO { get; set; } // 璁惧鍙� 鐢ㄩ�锛氱敤浜庢煡璇㈢嚎浣撳厜鐢碉紝鍒ゆ柇缂撳瓨浣嶆槸鍚︿负绌�+ public int N_IS_MANUAL { get; set; } // 鏄惁涓轰汉宸�(0.闈炰汉宸�2.浜哄伐) 鐢ㄩ�锛氬垏鎹汉宸ョ珯鍙�+ public int N_READ_LOC { get; set; } // 鏄惁璇荤爜浣�(0銆佸惁 1.鏄�
+
}
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/process/TaskProcess.cs
index 6fc893b..b63289e 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/process/TaskProcess.cs
@@ -30,7 +30,7 @@
LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
// 缁堢偣涓虹洿杩炵紦瀛樹綅锛屼笉缁戝畾
var loc = WMSHelper.GetTransfeRelevance(mst.S_END_LOC);
- if (loc != null && loc.S_PROPERTY == "1")
+ if (loc != null && loc.N_PROPERTY == 1)
{
LocationHelper.UnLockLoc(mst.S_END_LOC);
return;
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/wms/WMSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/wms/WMSHelper.cs
index 2f82ac0..4dac16e 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/wms/WMSHelper.cs
@@ -435,17 +435,16 @@
/// 1.鏌ヨ寮傚父鍖鸿揣浣� /// </summary>
/// <param name="areaCode">搴撳尯</param>
- /// <param name="type">绫诲瀷 1.绔嬪簱鎺ラ┏浣�2.缂撳瓨浣�/param>
- /// <param name="property">璐т綅灞炴�锛�.鐩磋繛 2.闈炵洿杩�3.浜哄伐 4.鍥哄畾绔欏彴锛�/param>
- /// <param name="actType">鍔ㄤ綔绫诲瀷锛�.榛樿 1.鍏ュ簱 2.鍑哄簱锛�/param>
+ /// <param name="property">璐т綅灞炴�锛�.鐩磋繛 2.闈炵洿杩烇級</param>
+ /// <param name="actType">鍔ㄤ綔绫诲瀷锛�.浜哄伐鎺ラ┏浣�1.鍏ュ簱鎺ラ┏浣�2.鍑哄簱鎺ラ┏浣嶏級</param>
/// <returns></returns>
- public static Location GetTransfeRelevanceLoc(string areaCode , string type ,string actType = "0" ,string property = "2" )
+ public static Location GetTransfeRelevanceLoc(string areaCode ,int actType ,int property )
{
Location loc = null;
var db = new SqlHelper<object>().GetInstance();
loc = db.Queryable<Location>()
.LeftJoin<TransfeRelevance>((a,b)=> a.S_CODE == b.S_LOC_CODE)
- .Where((a, b) => b.S_RELE_AREA.Trim() == areaCode && b.S_TYPE.Trim() == type && b.S_PROPERTY == property && b.S_ACT_TYPE == actType && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y")
+ .Where((a, b) => b.S_RELE_AREA.Trim() == areaCode && b.N_PROPERTY == property && b.N_ACT_TYPE == actType && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y")
.First();
return loc;
}
@@ -454,13 +453,13 @@
/// 鏌ヨ鎺ラ┏浣嶅叧鑱斿睘鎬� /// </summary>
/// <param name="locCode"></param>
- /// <param name="property">璐т綅灞炴� (1.鐩磋繛 2.闈炵洿杩炪�3.浜哄伐 銆�.鍥哄畾绔欏彴)</param>
+ /// <param name="isManual">璐т綅灞炴� (0.闈炰汉宸�1.浜哄伐)</param>
/// <returns></returns>
- public static bool updateTransfeLocProperty(string locCode ,string property)
+ public static bool updateTransfeLocProperty(string locCode ,int isManual)
{
bool result = false;
var db = new SqlHelper<object>().GetInstance();
- result = db.Updateable<TransfeRelevance>().SetColumns(a => new TransfeRelevance() { S_PROPERTY = property } ).Where(a => a.S_LOC_CODE.Trim() == locCode).ExecuteCommand() > 0;
+ result = db.Updateable<TransfeRelevance>().SetColumns(a => new TransfeRelevance() { N_IS_MANUAL = isManual } ).Where(a => a.S_LOC_CODE.Trim() == locCode).ExecuteCommand() > 0;
return result;
}
@@ -469,17 +468,16 @@
/// 娉細鏌ヨ浠诲姟鏈�皯鐨勬帴椹充綅
/// </summary>
/// <param name="areaCode">搴撳尯</param>
- /// <param name="property">璐т綅灞炴� (1.鐩磋繛 2.闈炵洿杩炪�3.浜哄伐 銆�.鍥哄畾绔欏彴)</param>
- /// <param name="type">绫诲瀷 1.绔嬪簱鎺ラ┏浣�2.缂撳瓨浣�3.鏈哄彴涓嬬嚎浣�4.寮傚父搴撲綅</param>
- /// <param name="actType">鍔ㄤ綔绫诲瀷 1.鍏ュ簱 2.鍑哄簱</param>
+ /// <param name="property">璐т綅灞炴� ( 0.浜哄伐 1.鐩磋繛 2.闈炵洿杩�</param>
+ /// <param name="actType">鍔ㄤ綔绫诲瀷 锛�.鍏ュ簱鎺ラ┏浣� 2.鍑哄簱鎺ラ┏浣嶏級</param>
/// <returns></returns>
- public static Location GetMinTaskTransfeLoc(string areaCode , string type ,string actType, string property = "2")
+ public static Location GetMinTaskTransfeLoc(string areaCode ,int actType, int property)
{
var db = new SqlHelper<object>().GetInstance();
var loc = db.Queryable<Location>()
.LeftJoin<TransfeRelevance>((a,b) => a.S_CODE == b.S_LOC_CODE)
.LeftJoin<WCSTask>((a,b,c) => a.S_CODE == c.S_END_LOC && c.N_B_STATE < 3)
- .Where((a, b, c) => b.S_RELE_AREA.Trim() == areaCode && b.S_TYPE.Trim() == type && b.S_ACT_TYPE.Trim() == actType && b.S_PROPERTY.Trim() == property && a.N_LOCK_STATE < 3 && a.C_ENABLE == "Y")
+ .Where((a, b, c) => b.S_RELE_AREA.Trim() == areaCode && b.N_ACT_TYPE == actType && b.N_PROPERTY == property && a.N_LOCK_STATE < 3 && a.C_ENABLE == "Y")
.GroupBy((a, b, c) => a.S_CODE)
.Select((a, b, c) => new {
count = SqlFunc.AggregateCount(c.S_END_LOC),
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs
index 4a352b9..27e6ed6 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/api/ApiHelper.cs
@@ -223,9 +223,10 @@
try
{
Location endLoc = LocationHelper.GetLoc(model.endLoc);
- if (endLoc.N_CURRENT_NUM == 0)
+ if (endLoc.N_CURRENT_NUM == 0)
{
- for (int i = 0; i < endLoc.N_CAPACITY; i++)
+ int taskNum = 0;
+ for (int i = 0; i < endLoc.N_CAPACITY; i++)
{
Location startLoc = WMSHelper.GetoutStockStartLoc(model.itemCode);
Location middleLoc = null;
@@ -258,12 +259,11 @@
}
else
{
- result.ResultCode = 1;
- result.ResultMsg = "搴撳唴娌℃湁婊¤冻鏉′欢鐨勭墿鏂�;
- return result;
+ LogHelper.Info($"搴撳唴娌℃湁鐗╂枡:{model.itemCode}", "WMS");
+ break;
}
-
+
if (endLoc != null)
{
var wmsTask = new WMSTask()
@@ -309,10 +309,22 @@
// 鏇存柊浣滀笟浠诲姟鐘舵�
wmsTask.N_B_STATE = 1;
WMSHelper.UpdateTaskState(wmsTask);
+ taskNum++;
}
}
}
}
+
+ if (taskNum < endLoc.N_CAPACITY)
+ {
+ result.ResultCode = 1;
+ result.ResultMsg = $"搴撳唴鐗╂枡涓嶈冻锛屽凡鐢熸垚鍑哄簱浠诲姟鏁�{taskNum}";
+ }
+ }
+ else
+ {
+ result.ResultCode = 1;
+ result.ResultMsg = "缁堢偣璐т綅褰撳墠瀹归噺涓嶄负0锛屾棤娉曞彨鏂�;
}
}
catch (Exception ex)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/config/config.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/config/config.json
index 5046270..67b3418 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/config/config.json
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/config/config.json
@@ -4,18 +4,34 @@
"SqlServer": "server=192.168.1.204;uid=root;pwd=yn123456;database=oimobox",
"SqlServer1": "Data Source=192.168.1.198\\sql2008;Initial Catalog=OIMobox;User ID=sa;Password=sa@2015",
"ApiPort": 8901,
- "FacCode": "1122",
- "WHCode": "YNJT",
+ "FacCode": "IF001",
+ "WHCode": "IW001",
"NDCApiUrl": "",
"baseTrayBufferLoc": [
- {
- "bufferOutLoc": "SeA21",
- "bufferInLoc": "PPA06-12-7-2"
+
+ {
+ "bufferOutLoc": "SeA26",
+ "bufferInLoc": "PPA06-12-1-2"
+ },
+ {
+ "bufferOutLoc": "SeA27",
+ "bufferInLoc": "PPA07-13-1-1"
+ },
+ {
+ "bufferOutLoc": "SeA28",
+ "bufferInLoc": "PPA07-13-1-2"
+ },
+ {
+ "bufferOutLoc": "SeA29",
+ "bufferInLoc": "PPA07-14-1-1"
+ },
+ {
+ "bufferOutLoc": "SeA231",
+ "bufferInLoc": "PPA07-14-1-2"
}
- ], // 姣嶆嫋鑷姩鍏ュ簱璐т綅
+ ],
"errorBufferArea": "EA",
"storeAreaCode": "PPA",
-
"AgvWaitLoc": [
{
"loc": "WA01",
@@ -29,138 +45,166 @@
}
],
- // type 1.agv鎺ラ┏浣� 2.浜哄伐鎺ラ┏浣� action 0.閫氱敤 1.鍏ュ簱 2.鍑哄簱
+ // action 0.閫氱敤 1.鍏ュ簱 2.鍑哄簱
"AgvJBLoc": [
{
"locCode": "SeA01",
- "type": 2,
"roadway": [ 1 ],
- "action": 0
+ "action": 1
},
{
"locCode": "SeA02",
- "type": 2,
"roadway": [ 1 ],
- "action": 0
+ "action": 1
},
{
"locCode": "SeA03",
- "type": 1,
"roadway": [ 1 ],
"action": 1
},
{
"locCode": "SeA04",
- "type": 1,
"roadway": [ 1 ],
"action": 2
},
{
"locCode": "SeA05",
- "type": 2,
- "roadway": [ 2, 3 ],
- "action": 0
+ "roadway": [ 2],
+ "action": 1
},
{
"locCode": "SeA06",
- "type": 2,
- "roadway": [ 2, 3 ],
- "action": 0
+ "roadway": [ 2 ],
+ "action": 1
},
{
"locCode": "SeA07",
- "type": 2,
- "roadway": [ 2, 3 ],
- "action": 0
+ "roadway": [ 2 ],
+ "action": 1
},
{
"locCode": "SeA08",
- "type": 2,
- "roadway": [ 2, 3 ],
- "action": 0
+ "roadway": [ 2 ],
+ "action": 2
},
{
"locCode": "SeA09",
- "type": 1,
- "roadway": [ 2, 3 ],
+ "roadway": [ 3 ],
"action": 1
},
{
"locCode": "SeA10",
- "type": 1,
- "roadway": [ 2, 3 ],
- "action": 2
+ "roadway": [ 3 ],
+ "action": 1
},
{
"locCode": "SeA11",
- "type": 2,
- "roadway": [ 4, 5 ],
- "action": 0
+ "roadway": [ 3 ],
+ "action": 1
},
{
"locCode": "SeA12",
- "type": 2,
- "roadway": [ 4, 5 ],
- "action": 0
+ "roadway": [ 3 ],
+ "action": 2
},
{
"locCode": "SeA13",
- "type": 1,
- "roadway": [ 4, 5 ],
+ "roadway": [ 3 ],
"action": 1
},
{
"locCode": "SeA14",
- "type": 1,
- "roadway": [ 4, 5 ],
+ "roadway": [ 3 ],
"action": 2
},
{
"locCode": "SeA15",
- "type": 2,
- "roadway": [ 4, 5 ],
- "action": 0
+ "roadway": [ 4 ],
+ "action": 1
},
{
"locCode": "SeA16",
- "type": 2,
- "roadway": [ 4, 5 ],
- "action": 0
+ "roadway": [ 4 ],
+ "action": 1
},
{
"locCode": "SeA17",
- "type": 2,
- "roadway": [ 6, 7 ],
- "action": 0
+ "roadway": [ 4 ],
+ "action": 1
},
{
"locCode": "SeA18",
- "type": 2,
- "roadway": [ 6, 7 ],
- "action": 0
+ "roadway": [ 4 ],
+ "action": 2
},
{
"locCode": "SeA19",
- "type": 2,
- "roadway": [ 6, 7 ],
- "action": 0
+ "roadway": [ 4 ],
+ "action": 1
},
{
"locCode": "SeA20",
- "type": 2,
- "roadway": [ 6, 7 ],
- "action": 0
+ "roadway": [ 4 ],
+ "action": 2
},
{
"locCode": "SeA21",
- "type": 1,
- "roadway": [ 6, 7 ],
+ "roadway": [ 5 ],
"action": 1
},
{
"locCode": "SeA22",
- "type": 1,
- "roadway": [ 6, 7 ],
+ "roadway": [ 5 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA23",
+ "roadway": [ 5 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA24",
+ "roadway": [ 5 ],
+ "action": 2
+ },
+ {
+ "locCode": "SeA25",
+ "roadway": [ 6 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA26",
+ "roadway": [ 6 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA27",
+ "roadway": [ 7 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA28",
+ "roadway": [ 7 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA29",
+ "roadway": [ 6,7 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA30",
+ "roadway": [ 6,7 ],
+ "action": 2
+ },
+ {
+ "locCode": "SeA31",
+ "roadway": [ 6,7 ],
+ "action": 1
+ },
+ {
+ "locCode": "SeA32",
+ "roadway": [ 6,7 ],
"action": 2
}
]
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs
index 8712fcb..18a5dda 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/core/WCSCore.cs
@@ -37,7 +37,6 @@
var wmsTask = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE);
if (wmsTask != null && wmsTask.N_B_STATE < 2)
{
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
if (model.State <= 7)
{
//鏈変换鍔″彿璇锋眰
@@ -152,7 +151,7 @@
if (agvJBLoc != null && agvJBLoc.action == 1)
{
//鏄垯鏌ヨWCS鐨勪换鍔℃墽琛屾儏鍐�- var wcsTask = WCSHelper.GetTaskBySrcNoAndScheduleType(TN_Task.S_OP_CODE, "WCS");
+ var wcsTask = WCSHelper.GetTaskBySrcNoAndScheduleType(TN_Task.S_OP_CODE, "WCS" , wmsTask.S_TYPE);
if (wcsTask != null)
{
bool existAction = WCSHelper.CheckActionRecordExist(wcsTask.S_CODE, 7);
@@ -214,6 +213,8 @@
//瀹夊叏璇锋眰绛� TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData);
}
+
+ WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
}
}
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs
index 5b3675b..3b7c42a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs
@@ -163,7 +163,6 @@
// 瀹夊叏璇锋眰鍙戦�鎴愬姛锛屾坊鍔犱换鍔″姩浣滆褰� if (result)
{
- WCSHelper.AddActionRecord(no, state, forkliftNo, extData);
LogHelper.Info($"棣栨杩涜瀹夊叏璇锋眰鎴愬姛", "AGV");
}
}
@@ -214,7 +213,6 @@
if (mst.N_B_STATE == 0) {
var startLoc = LocationHelper.GetLocation(mst.S_START_LOC);
var endLoc = LocationHelper.GetLocation(mst.S_END_LOC);
- var container = ContainerHelper.GetCntr(mst.S_CNTR_CODE);
if (mst.S_SCHEDULE_TYPE == "AGV")
{
AddOrderNewModel model = new AddOrderNewModel()
@@ -267,7 +265,6 @@
from = mst.S_START_LOC,
to = mst.S_END_LOC,
cntrNo = mst.S_CNTR_CODE,
- cntrType = container.N_TYPE.ToString(),
};
LogHelper.Info($"鍚慦CS涓嬪彂浠诲姟锛屼换鍔″弬鏁帮細{sendTask}", "WMS");
var bo = WCSDispatch.sendTask(sendTask);
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs
index dbd3fd0..846a55c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs
@@ -155,7 +155,7 @@
public string locCode { get; set; }
public string name { get; set; }
public List<int> roadway { get; set; }
- public int action { get; set; } // 0.閫氱敤 1.鍏ュ簱 2.鍑哄簱
+ public int action { get; set; } // 1.鍏ュ簱 2.鍑哄簱
}
public class AgvWaitLoc
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/wms/WCSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/wms/WCSHelper.cs
index 9d7c258..8b7ce3a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/wms/WCSHelper.cs
@@ -58,10 +58,10 @@
var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE== no).First();
return task;
}
- internal static WCSTask GetTaskBySrcNoAndScheduleType(string no ,string scheduleType)
+ internal static WCSTask GetTaskBySrcNoAndScheduleType(string no ,string scheduleType ,string taskType)
{
var db = new SqlHelper<WCSTask>().GetInstance();
- var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == no && a.S_SCHEDULE_TYPE == scheduleType).First();
+ var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == no && a.S_SCHEDULE_TYPE == scheduleType && a.S_TYPE.Contains(taskType)).First();
return task;
}
internal static List<WCSTask> GetTaskListBySrcNo(string no)
--
Gitblit v1.9.1