From f8e049e2a30f711a56b735361a230216d8808f0b Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 30 六月 2025 17:12:30 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/api/AgvController.cs | 3
HH.WCS.QingXiNongfu/obj/Debug/HH.WCS.QingXigongchang.csproj.FileListAbsolute.txt | 5
HH.WCS.QingXiNongfu/settings.xml | 2
HH.WCS.QingXiNongfu/bin/Debug/settings.xml | 2
HH.WCS.QingXiNongfu/dispatch/NDC.cs | 62 ++++++
HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj | 25 ++
HH.WCS.QingXiNongfu/core/TaskCore.cs | 15 +
HH.WCS.QingXiNongfu/core/Monitor.cs | 273 ++++++++++++++++++++------
HH.WCS.QingXiNongfu/Properties/app.manifest | 73 +++++++
HH.WCS.QingXiNongfu/Program.cs | 46 ++--
HH.WCS.QingXiNongfu/wms/LocationHelper.cs | 6
HH.WCS.QingXiNongfu/wms/WMSModel.cs | 5
HH.WCS.QingXiNongfu/process/DeviceProcess.cs | 23 +
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 48 ++++
HH.WCS.QingXiNongfu/wms/WCSModel.cs | 1
15 files changed, 475 insertions(+), 114 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj b/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj
index 1c11713..a8835a0 100644
--- a/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj
+++ b/HH.WCS.QingXiNongfu/HH.WCS.QingXigongchang.csproj
@@ -13,6 +13,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
+ <IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -25,7 +26,6 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
@@ -47,6 +47,27 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignManifests>true</SignManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestCertificateThumbprint>C8059AFDFCE52C60DA32D8A0FE8AB2F99859D6B0</ManifestCertificateThumbprint>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestKeyFile>HH.WCS.QingXigongchang_TemporaryKey.pfx</ManifestKeyFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <TargetZone>LocalIntranet</TargetZone>
+ </PropertyGroup>
+ <PropertyGroup>
+ <GenerateManifests>true</GenerateManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -172,6 +193,7 @@
<ItemGroup>
<Content Include="鍘熺墿鏂欐柟娉曟杩�txt" />
<None Include="App.config" />
+ <None Include="HH.WCS.QingXigongchang_TemporaryKey.pfx" />
<None Include="packages.config" />
<Content Include="Static\css\app.d545ec97.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -182,6 +204,7 @@
<Content Include="Static\js\chunk-vendors.3e768dfe.js.map">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <None Include="Properties\app.manifest" />
<None Include="Static\js\app.829e775c.js.map">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs
index 8d55a5a..7d54442 100644
--- a/HH.WCS.QingXiNongfu/Program.cs
+++ b/HH.WCS.QingXiNongfu/Program.cs
@@ -1,5 +1,4 @@
锘縰sing HH.WCS.QingXigongchang.api;
-using HH.WCS.QingXigongchang.core;
using HH.WCS.QingXigongchang.device;
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
@@ -735,33 +734,34 @@
{
GetTask(Monitor.A),//璁℃暟鍣� 娓呴櫎 鎺у埗鍙� //娣诲姞浠诲姟鎺ㄩ�绾跨▼
- GetTask(TaskCore.Dispatch),
- GetTask(TaskCore.Kuronggg),
+ //GetTask(TaskCore.Dispatch),
+ //GetTask(TaskCore.Kuronggg),
- GetTask(TaskCore.ChargeHostAgv),
- //鎵嬪姩杞繍
- GetTask(Monitor.BottleCapAuto2),
- /// 鑷姩杞繍
- GetTask(Monitor.BottleCapAuto3, 1),
- //閿佹帓 - 娓呴櫎 鎺掔┖浜嗘墠瑙ｉ攣銆�
- GetTask(Monitor.BottleCapAuto4),
- //鑷姩棰嗘枡 - 涓婅緭閫佺嚎
- GetTask(Monitor.BottleCapAuto5),
- //绌烘涓浆锛岃浆鎷嗘
- GetTask(Monitor.BottleCapAuto6),
- //鍑哄簱鍗曟壒鍒�- GetTask(Monitor.BottleCapAuto7),
- //鑷姩涓浆
- GetTask(Monitor.BB7),
+ //GetTask(TaskCore.ChargeHostAgv),
+ ////鎵嬪姩杞繍
+ //GetTask(Monitor.BottleCapAuto2),
+ ///// 鑷姩杞繍
+ //GetTask(Monitor.BottleCapAuto3, 1),
+ ////閿佹帓 - 娓呴櫎 鎺掔┖浜嗘墠瑙ｉ攣銆�
+ //GetTask(Monitor.BottleCapAuto4),
+ ////鑷姩棰嗘枡 - 涓婅緭閫佺嚎
+ //GetTask(Monitor.BottleCapAuto5),
+ ////绌烘涓浆锛岃浆鎷嗘
+ //GetTask(Monitor.BottleCapAuto6),
+ ////鍑哄簱鍗曟壒鍒�+ //GetTask(Monitor.BottleCapAuto7),
+ ////鑷姩涓浆
+ //GetTask(Monitor.BB7),
//鍘熸潗鏂�鑷姩涓浆 - 灞曠ず娴佺▼銆�鍓嶆湡娴嬭瘯鐢ㄧ殑
//GetTask(Monitor.AutoRun),
GetTask(Monitor.YwlTKPEBQ_Auto),//鏍囩鏃犺弻姘寸嚎鍑哄叆搴撱�
//鍘熸潗鏂欑殑 鏂颁腑杞祦绋嬨�
- GetTask(Monitor.YWL_ZX_Turn),
- GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆
- GetTask(Monitor.AutoRunABD),
- GetTask(Monitor.AutoRun13TSJ),
- GetTask(Monitor.ZdzyABArea),
+ //GetTask(Monitor.YWL_ZX_Turn),
+ //GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆
+ //GetTask(Monitor.AutoRunABD),
+ //GetTask(Monitor.AutoRun13TSJ),
+ //GetTask(Monitor.ZdzyABArea),
+ // GetTask(Monitor.Qchc),
//GetTask(Monitor.AutoTK_PE),//鎻愭墸 - PE鑶滃嚭鍏ュ簱
diff --git a/HH.WCS.QingXiNongfu/Properties/app.manifest b/HH.WCS.QingXiNongfu/Properties/app.manifest
new file mode 100644
index 0000000..c7d2b13
--- /dev/null
+++ b/HH.WCS.QingXiNongfu/Properties/app.manifest
@@ -0,0 +1,73 @@
+锘�?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+ <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+ <!-- UAC 娓呭崟閫夐」
+ 濡傛灉鎯宠鏇存敼 Windows 鐢ㄦ埛甯愭埛鎺у埗绾у埆锛岃浣跨敤
+ 浠ヤ笅鑺傜偣涔嬩竴鏇挎崲 requestedExecutionLevel 鑺傜偣銆�+
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+ <requestedExecutionLevel level="highestAvailable" uiAccess="false" />
+
+ 鎸囧畾 requestedExecutionLevel 鍏冪礌灏嗙鐢ㄦ枃浠跺拰娉ㄥ唽琛ㄨ櫄鎷熷寲銆�+ 濡傛灉浣犵殑搴旂敤绋嬪簭闇�姝よ櫄鎷熷寲鏉ュ疄鐜板悜鍚庡吋瀹规�锛屽垯绉婚櫎姝�+ 鍏冪礌銆�+ -->
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+ </requestedPrivileges>
+ <applicationRequestMinimum>
+ <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+ <defaultAssemblyRequest permissionSetReference="Custom" />
+ </applicationRequestMinimum>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- 璁捐姝ゅ簲鐢ㄧ▼搴忎笌鍏朵竴璧峰伐浣滀笖宸查拡瀵规搴旂敤绋嬪簭杩涜娴嬭瘯鐨�+ Windows 鐗堟湰鐨勫垪琛ㄣ�鍙栨秷璇勮閫傚綋鐨勫厓绱狅紝
+ Windows 灏嗚嚜鍔ㄩ�鎷╂渶鍏煎鐨勭幆澧冦� -->
+ <!-- Windows Vista -->
+ <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+ <!-- Windows 7 -->
+ <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+ <!-- Windows 8 -->
+ <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+ <!-- Windows 8.1 -->
+ <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+ <!-- Windows 10 -->
+ <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+ </application>
+ </compatibility>
+ <!-- 鎸囩ず璇ュ簲鐢ㄧ▼搴忓彲鎰熺煡 DPI 涓�Windows 鍦�DPI 杈冮珮鏃跺皢涓嶄細瀵瑰叾杩涜
+ 鑷姩缂╂斁銆俉indows Presentation Foundation (WPF)搴旂敤绋嬪簭鑷姩鎰熺煡 DPI锛屾棤闇�+ 閫夋嫨鍔犲叆銆傞�鎷╁姞鍏ユ璁剧疆鐨�Windows 绐椾綋搴旂敤绋嬪簭(闈㈠悜 .NET Framework 4.6)杩樺簲
+ 鍦ㄥ叾 app.config 涓皢 "EnableWindowsFormsHighDpiAutoResizing" 璁剧疆璁剧疆涓�"true"銆�+
+ 灏嗗簲鐢ㄧ▼搴忚涓烘劅鐭ラ暱璺緞銆傝鍙傞槄 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+ <!--
+ <application xmlns="urn:schemas-microsoft-com:asm.v3">
+ <windowsSettings>
+ <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+ <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+ </windowsSettings>
+ </application>
+ -->
+ <!-- 鍚敤 Windows 鍏叡鎺т欢鍜屽璇濇鐨勪富棰�Windows XP 鍜屾洿楂樼増鏈� -->
+ <!--
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+ -->
+</assembly>
\ No newline at end of file
diff --git a/HH.WCS.QingXiNongfu/api/AgvController.cs b/HH.WCS.QingXiNongfu/api/AgvController.cs
index cd981fa..ce3f676 100644
--- a/HH.WCS.QingXiNongfu/api/AgvController.cs
+++ b/HH.WCS.QingXiNongfu/api/AgvController.cs
@@ -1,6 +1,5 @@
锘縰sing HH.WCS.QingXigongchang.core;
using HH.WCS.QingXigongchang.dispatch;
-using HH.WCS.QingXigongchang.process;
using Newtonsoft.Json;
using System.Collections.Generic;
using System.Web.Http;
@@ -15,7 +14,7 @@
public class AgvController : System.Web.Http.ApiController
{
[HttpPost]
- //[Route("AGVCallbackState")]
+ // [Route("AGVCallbackState")]
public ReturnResult AGVCallbackState(AgvTaskState model)
{
LogHelper.Info("AGVCallbackState 鎺ュ彈鍒癆GV鏁版嵁锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
diff --git a/HH.WCS.QingXiNongfu/bin/Debug/settings.xml b/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
index 429ad92..c20275e 100644
--- a/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
+++ b/HH.WCS.QingXiNongfu/bin/Debug/settings.xml
@@ -128,7 +128,7 @@
{"address":"10.140.3.187","deviceName":"鐡剁洊5L缈绘枟鏈�,"deviceNo":["","187"],"location":["SXFDJ-1"],"deviceType":10,"areaPriy":["PGMKCK"],"enable":1},
{"address":"10.140.3.170","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
- {"address":"10.140.8.65","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.9.167","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
]]]>
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 314be2c..c825c89 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1026,6 +1026,8 @@
static List<string> ABlist = new List<string> { "YWLAQWJ", "YWLBQWJ" };
static List<string> CDlist = new List<string> { "YWLCQSX", "YWLDQWJ" };
static bool InworkLock = false;
+ //Dictionary<string, List<RowLock>> RGRowList = new Dictionary<string, List<RowLock>>();
+ public static List<RowLock> RGRow = new List<RowLock>();
/// <summary>
/// 鍘熸潗鏂�妫�祴鍚勬祦杞綅缃� 鍐欏叆鎵樼洏璐т綅s_type 涓�涓嬩竴涓洰鐨勫湴銆傚氨寮�涓浆銆� /// 鍘熺墿鏂欑焊绠憋紝鍏ュ簱鍫嗗彔鍖鸿浆杩�YWLRGDD--浜哄伐鍫嗗彔鍖�@@ -1043,6 +1045,7 @@
{
try
{
+
var lolist = LocationHelper.GetAreaNormalLocList(area);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.S_LOCK_STATE != "鎶ュ簾");
var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key);
Dictionary<string, List<Location>> dsll = new Dictionary<string, List<Location>>();
@@ -1063,6 +1066,8 @@
if (!cntritems.Any())
continue;
var cir1 = cntritems.First();
+
+
//鍙瓫閫夌焊绠辩墿鏂欑殑搴撳尯鏁版嵁銆� if (!string.IsNullOrEmpty(cir1.S_ITEM_NAME) && cir1.S_ITEM_NAME.Contains("绾哥-"))
if (dsll.TryGetValue(cir1.S_ITEM_CODE, out List<Location> ll))
@@ -1123,12 +1128,22 @@
if (ABlist.Contains(EdnRarea))
{
var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿� || x.S_LOCK_STATE == "鍑哄簱閿�));
- if (ls.Any())
+ //var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿�));
+ if (ls.Count() > 1)
{
LogHelper.Info($"{EdnRarea}浠诲姟鏁�绠″埗2");
continue;
}
}
+ //else if (CDlist.Contains(EdnRarea))
+ //{
+ // var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == EdnRarea && (x.S_LOCK_STATE == "鍏ュ簱閿�)).ToList();
+ // if (ls.Count() > 2)
+ // {
+ // LogHelper.Info($"CD鍖哄叆搴撲换鍔＄鍒舵渶澶ф暟3 {EdnRarea}");
+ // continue;
+ // }
+ //}
var cntritems = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE);
if (!cntritems.Any())
continue;
@@ -1167,17 +1182,19 @@
if (CDlist.Contains(EdnRarea))
{
isCd = true;
- inlockLis = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && x.S_LOCK_STATE == "鍏ュ簱閿�).ToList();
- if (inlockLis.Count() > 0)
- {
- inlock = inlockLis.FirstOrDefault();
- }
+ //inlockLis = LocationHelper.GetList<RowLock>(x => x.S_AREA_CODE == EdnRarea && x.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && x.S_LOCK_STATE == "鍏ュ簱閿�).ToList();
+ //if (inlockLis.Count() > 0)
+ //{
+ // inlock = inlockLis.FirstOrDefault();
+ //}
+ inlock = RGRow.FirstOrDefault();
if (inlock != null)
{
//褰撳叆搴撶殑浠诲姟鑳芥斁婊′竴鎺掑苟涓旇繕鏈変綑鐨勬椂鍊�寮�浜屾帓
//鍏堝垽鏂捣鐐规湁澶氬皯鐩稿悓鐨�鑳藉叆鐨勭墿鏂� if (_cl.S_AREA_CODE == "YWLRGDD")//鍒ゆ柇璧风偣鏄惁鏄汉宸ュ爢鍙犲尯
{
+ inlockLis = RGRow.FindAll(e => e.S_AREA_CODE == EdnRarea && e.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME).ToList();
//鐒跺悗鍒ゆ柇浜哄伐鍫嗗彔鍖洪渶瑕佸叆搴撳灏戞墭鍚屽搧绉嶇墿鏂�startMum
//璐т綅 鎵樼洏 鐗╂枡琛ㄨ仈鏌� LogHelper.Info($"鏌ヨ捣鐐规湁澶氬皯鍚屽搧绉嶇殑鐗╂枡 寮�");
@@ -1187,6 +1204,7 @@
LogHelper.Info($"璧风偣瑕佸叆CD鐨勬湁澶氬皯鎵樼洏鏁伴噺涓簕lstCanOutL.Count()}");
//鍒ゆ柇缁堢偣鎺掕兘鍏ュ灏� 灏戜簬鍏ュ簱鎵樼洏鏁板垯澶氬紑涓�帓 EndMum
var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "鏃� && inlockLis.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
+ LogHelper.Info($"缁堢偣CD鎺掓湁澶氬皯绌烘墭鑳藉叆{lstCanOutL.Count()}");
if (lstCanOutL.Count <= EndMum.Count())
{
arloclist = arloclist.FindAll(x => inlockLis.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
@@ -1202,6 +1220,26 @@
{
arloclist = arloclist.FindAll(x => x.N_ROW == inlock.N_ROW).ToList();
}
+ }
+ else
+ {
+ if (_cl.S_AREA_CODE == "YWLRGDD")
+ {
+ //鏌ヨ鏄惁鏈夊凡缁忓叆浜嗙殑鎺�+ var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
+ ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == cir1.S_ITEM_CODE && t.S_ITEM_NAME == cir1.S_ITEM_NAME && t.S_CJ_NAME == cir1.S_CJ_NAME && o.S_AREA_CODE == EdnRarea);
+ var lstCanOutL = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
+ LogHelper.Info($"缁堢偣鏈夌浉鍚岀殑鐗╂枡鐨勮揣浣嶆湁{lstCanOutL.Count()}");
+ if (lstCanOutL.Count() > 0)
+ {
+ var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "鏃� && lstCanOutL.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();
+ if (EndMum.Count() > 0)
+ {
+ arloclist = arloclist.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
+ }
+ }
+ }
+
}
}
foreach (var rss in arloclist.GroupBy(x => x.N_ROW).OrderByDescending(x => x.Count(y => y.N_CURRENT_NUM > 0)).ThenBy(x => x.Key))
@@ -1267,12 +1305,24 @@
var sign = Settings.GetTimeStamp();
var res = TaskProcess.CreateTransport(sign, _cl.S_LOC_CODE, endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", _clrel.Select(x => x.S_CNTR_CODE).ToList(), 1, endbit.N_CURRENT_NUM + 1, 1, 50, Last);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");
LogHelper.Info($"{r.Key}鍘熺墿鏂欐惉杩�{sign} 浠诲姟 锛屽垱寤簕res} ");
- if (res && inlock == null && isCd)
+ if (CDlist.Contains(endbit.S_AREA_CODE) && res)
{
- var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };
- LogHelper.Info($"鍘熺墿鏂欏叆搴�娣诲姞鎺掗攣淇℃伅{JsonConvert.SerializeObject(rrrr)} ");
- WCSHelper.Do(db => db.Insertable(rrrr).ExecuteCommand());
+ LogHelper.Info($"娣诲姞鍐呭瓨鎺掗攣");
+ var ggf = inlockLis.Find(e => e.S_LOCK_SRC == cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME && e.S_AREA_CODE == endbit.S_AREA_CODE && e.N_ROW == endbit.N_ROW);
+ LogHelper.Info($"娣诲姞鍐呭瓨鎺掗攣 鏄惁鏌ヨ鍒版暟鎹�{JsonConvert.SerializeObject(ggf)}");
+ if (ggf == null)
+ {
+ var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };
+ inlockLis.Add(rrrr);
+ LogHelper.Info($"娣诲姞鍐呭瓨鎺掗攣 娣诲姞鏁版嵁鍒板唴瀛樻帓閿佷腑:{JsonConvert.SerializeObject(inlockLis)}");
+ }
}
+ //if (res && inlock == null && isCd)
+ //{
+ // var rrrr = new RowLock { S_LOCK_SRC = cir1.S_ITEM_CODE + cir1.S_ITEM_NAME + cir1.S_CJ_NAME, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "鍏ュ簱閿�, S_AREA_CODE = endbit.S_AREA_CODE, N_ROW = endbit.N_ROW };
+ // LogHelper.Info($"鍘熺墿鏂欏叆搴�娣诲姞鎺掗攣淇℃伅{JsonConvert.SerializeObject(rrrr)} ");
+ // WCSHelper.Do(db => db.Insertable(rrrr).ExecuteCommand());
+ //}
if (EdnRarea == "YWLWJJB") InworkLock = false;
break;
}
@@ -1397,6 +1447,7 @@
{
try
{
+ // var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
if (!yuworders.Any())
{
@@ -1430,6 +1481,7 @@
var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
if (!Syuworders.Any())
{
+ //姘寸嚎鏍囩鍏ュ簱
YwlBQ_CreInwork(SlocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
}
if (tklist.Count() > 0)
@@ -1448,6 +1500,8 @@
LogHelper.CErrorLog($"{tk.SQL_WorkNo}-{tk.SQL_PLineNo} 閫�簱宸ュ崟寮�惎锛岀粦瀹氱殑 闆舵暣 鏍囪");
}
Location Endbit = null;
+ // var hjs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == SX_BQ.RK_BBHJQ).FindAll(x => x.S_LOCK_STATE == "鏃� && x.N_CURRENT_NUM == 0);
+ // var hjs = db.Queryable<Location>().Where(l => l.S_AREA_CODE == SX_BQ.RK_BBHJQ && l.S_LOCK_STATE.Trim() == "鏃�).ToList();
var hjs = LocationHelper.GetAreaNormalLocList(SX_BQ.RK_BBHJQ, true, false);
Endbit = hjs.FindAll(x => x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
if (Endbit != null)
@@ -1487,10 +1541,10 @@
{
//return;
///璧风偣鏁版嵁銆� 缁堢偣搴撳尯 鍫嗗彔灞傛暟銆�- YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 3);//鎻愭墸鍏ュ簱--PE鑶�- YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 1); // PE鍏ュ簱 --鎻愭墸
- //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
- //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴�+ YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "鏀剁缉鑶滃弶杩�, 2);//PE鑶�+ YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "鎻愭墸鍙夎繍", 1); //鎻愭墸
+ //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "鏀剁缉鑶滃弶杩�);
+ //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "鏀剁缉鑶滃弶杩�);// PE涓嚭搴�
var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2鎻愬崌鏈�鏀剁缉鑶� && x.WorkType == 1 && x.SQL_State == "鎵ц涓�);
if (tklist.Count() > 0)
@@ -1858,16 +1912,16 @@
{
var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
Location Endbit = null;
- if (area == area/* WJ_BQ.RK_BQJBQ*/)
+ //if (area == area/* WJ_BQ.RK_BQJBQ*/)
+ //{
+ var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
+ Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ if (Endbit != null)
{
- var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
- Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
- if (Endbit != null)
- {
- var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
- LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
- }
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
}
+ // }
//else
//{
@@ -2091,7 +2145,7 @@
foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList())
{
Location EndBit = null;
- var rsfull = ptR.OrderBy(X => X.N_COL).ToList().FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ var rsfull = ptR.OrderBy(X => X.N_COL).ToList().FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();//璧风偣
if (rsfull != null)
{
var rklist = LocationHelper.GetRowLock(v);
@@ -3717,16 +3771,22 @@
{
LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
// 鍏堢湅鏄惁鏈夊埌璇ュ簱鍖虹殑杞繍浠诲姟銆�
- var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW);
-
- //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�- var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
- if (itemTRUN)
- { //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�-
+ var zxs = LocationHelper.GetList<YWLZXtake>(X => X.S_ZX_STATE == "鎵ц" && X.S_END_AREA == od.S_ROW).ToList();
+ //鏌ヨ鏄惁鏈夐噸澶嶇殑宸ュ崟鍦ㄦ墽琛�+ var ggf = zxs.Find(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName);
+ if (ggf != null)
+ {
LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
- return;
+ continue;
}
+ //1.鏌ョ湅鐗╂枡鏄惁鍖归厤銆�+ //var itemTRUN = zxs.Any(x => x.S_ITEM_CODE == od.SQL_ItemCode && x.S_ITEM_NAME == od.SQL_ItemName && x.S_CJ_NAME == od.S_CJ_NAME);
+ //if (itemTRUN)
+ //{ //鏈夊埌璇ュ簱鍖虹殑 鐗╂枡杞繍浠诲姟浜嗐� 涓嶉渶瑕佺户缁簡 銆�+
+ // LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}宸茬粡瀛樺湪杞繍浜嗘棤闇�Е鍙戣浆杩愩�");
+ // return;
+ //}
//浜哄伐杞繍娌℃寚瀹氱墿鏂欙紝鎴戜細鑷姩鍐欏洖杞繍鍗�鐗╂枡鏁版嵁銆�
//鎵綜D 鍖�鍝噷鏈夎繖涓墿鏂欍�
@@ -3741,17 +3801,17 @@
{
lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where((o, p, t) => o.S_AREA_CODE == area && o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName).ToList();
}
- List<string> CRk = new List<string>() { "鍑哄簱閿�, "鍏ュ簱閿� };
- var EndMum = newDb.Queryable<Location>().Where(l => l.S_AREA_CODE == area && CRk.Contains(l.S_LOCK_STATE)).ToList();
- var RowLock = EndMum.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
- foreach (var item in RowLock)
- {
- lstCanOutL.RemoveAll(e => e.N_ROW == item.N_ROW);
- }
+ //List<string> CRk = new List<string>() { "鍑哄簱閿�, "鍏ュ簱閿� };
+ //var EndMum = newDb.Queryable<Location>().Where(l => l.S_AREA_CODE == area && CRk.Contains(l.S_LOCK_STATE)).ToList();
+ //var RowLock = EndMum.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
+ //foreach (var item in RowLock)
+ //{
+ // lstCanOutL.RemoveAll(e => e.N_ROW == item.N_ROW);
+ //}
if (lstCanOutL.Count() > 0)
{
- var LstCan = newDb.Queryable<LocCntrRel>().Where(a => lstCanOutL.Select(e => e.S_LOC_CODE).ToList().Contains(a.S_LOC_CODE)).ToList();
- var loc = lstCanOutL.Find(e => e.S_LOC_CODE == LstCan.OrderBy(c => c.T_CREATE).FirstOrDefault().S_LOC_CODE);
+ //var LstCan = newDb.Queryable<LocCntrRel>().Where(a => lstCanOutL.Select(e => e.S_LOC_CODE).ToList().Contains(a.S_LOC_CODE)).ToList();
+ var loc = lstCanOutL.OrderBy(e => e.T_FULL_TIME).FirstOrDefault();
TrunStart.area = area;
TrunStart.Row = loc.N_ROW;
}
@@ -3771,21 +3831,21 @@
}
LogHelper.Info($"ZdzyABArea{od.SQL_WorkNo}瑙﹀彂杞繍銆傝浆杩愭潵婧愭槸{JsonConvert.SerializeObject(TrunStart)}");
if (TrunStart?.area != null)
- WCSHelper.Do(db =>
+ {
+ var ggft = new YWLZXtake()
{
- db.Insertable(new YWLZXtake
- {
- S_START_AREA = TrunStart.area,
- N_START_ROW = TrunStart.Row,
- S_END_AREA = od.S_ROW,
- S_ZX_STATE = "鎵ц",
- S_ITEM_CODE = od.SQL_ItemCode,
- S_ITEM_NAME = od.SQL_ItemName,
- S_CJ_NAME = od.S_CJ_NAME,
- S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
- }).ExecuteCommand();
- });
-
+ SQL_WorkNo = "CKD" + DateTime.Now.Ticks.ToString(),
+ S_START_AREA = TrunStart.area,
+ N_START_ROW = TrunStart.Row,
+ S_END_AREA = od.S_ROW,
+ S_ZX_STATE = "鎵ц",
+ S_ITEM_CODE = od.SQL_ItemCode,
+ S_ITEM_NAME = od.SQL_ItemName,
+ S_CJ_NAME = od.S_CJ_NAME,
+ S_ZZ_AREA = (od.S_ROW == "YWLAQWJ" ? "YWLWJJB" : od.S_ROW)
+ };
+ var gf = newDb.Insertable(ggft).ExecuteCommand();
+ }
}
}
}
@@ -3805,6 +3865,7 @@
/// </summary>
public static void AutoRun13TSJ()
{
+
//Action<YWLWorkOrder> _sAB娌＄墿鏂欐垨鑰呬綑閲忎笉瓒冲紑濮嬭Е鍙戣窡鏍规嵁鑷姩杞繍_鍚嶅瓧瓒婇暱瓒婂ソ = (od) =>
//{
// LogHelper.Info($"AutoRun13TSJ{od.SQL_WorkNo}瀵瑰簲宸ュ崟鐨剓od.S_ROW} 鐗╂枡鏁伴噺涓嶈冻銆傝Е鍙戣浆杩愩�");
@@ -3922,29 +3983,77 @@
foreach (var area in v) //.Concat(od.S_ROW.Split('$')).Distinct())
{
- var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
- foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
+ if (ABlist.Contains(area))
{
- var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
- if (rl == null) continue;
- _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
- //鏉垮瀷鐩稿悓
- var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
- LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
- var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
- LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
- if (_clcntitem != null)
+ //AreaRowlist = LocationHelper.GetAreaNormalLocList(area);YWLBQWJ
+ // var AreaRowlist = LocationHelper.GetAreaNormalLocList("YWLAQWJ").Union(LocationHelper.GetAreaNormalLocList("YWLBQWJ")).ToList();
+ var db = new SqlHelper<object>().GetInstance();
+ var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
+ ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "鏃� && t.S_ITEM_CODE == od.SQL_ItemCode && t.S_ITEM_NAME == od.SQL_ItemName && (o.S_AREA_CODE == "YWLAQWJ" || o.S_AREA_CODE == "YWLBQWJ"));
+ var lstCanOutL = db.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
+ if (lstCanOutL.Count() > 0)
{
- LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME));
- if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
+ var rl = lstCanOutL.OrderBy(e => e.T_FULL_TIME).FirstOrDefault();
+ _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+ //鏉垮瀷鐩稿悓
+ var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+ if (rl != null)
{
StartBit = rl;
- break;
+ }
+ }
+ else
+ {
+ LogHelper.Info($"AutoRun13TSJ 鏈哄彴:{pline} 鐗╂枡缂栫爜:{od.SQL_ItemCode}鐗╂枡鍚嶇О:{od.SQL_ItemName} AB鍖虹己鏂�);
+ }
+
+
+ //if (rl == null) continue;
+ //_clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+ ////鏉垮瀷鐩稿悓
+ //var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+ //LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+ //var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
+ //LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+ //if (_clcntitem != null)
+ //{
+ // LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME));
+ // if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
+ // {
+ // StartBit = rl;
+ // break;
+ // }
+ //}
+
+ }
+ else
+ {
+ var AreaRowlist = LocationHelper.GetAreaNormalLocList(area);
+ foreach (var item in AreaRowlist.GroupBy(x => x.N_ROW))
+ {
+ var rl = item.ToList().FindAll(x => x.N_CURRENT_NUM > 0).OrderBy(x => x.N_COL).LastOrDefault();
+ if (rl == null) continue;
+ _clrel = LocationHelper.GetLocCntrRel(rl.S_LOC_CODE);
+ //鏉垮瀷鐩稿悓
+ var _clrel0 = _clrel.OrderByDescending(xx => xx.T_CREATE).First();
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏绫诲瀷銆� + JsonConvert.SerializeObject(_clrel0));
+ var _clcntitem = ContainerHelper.GetCntrItemRel(_clrel0.S_CNTR_CODE.Trim()).FirstOrDefault();
+ LogHelper.Info("AutoRun13TSJ" + rl.S_LOC_CODE + "璇嗗埆鎵樼洏涓婄殑鐗╂枡淇℃伅銆� + JsonConvert.SerializeObject(_clcntitem));
+ if (_clcntitem != null)
+ {
+ LogHelper.Info("AutoRun13TSJ" + "鐩镐簰鏄惁鍖归厤 _clcntitem S_ITEM_CODE:" + _clcntitem.S_ITEM_CODE + " od" + od.SQL_ItemCode + " _clcntitem S_ITEM_NAME:" + _clcntitem.S_ITEM_NAME + "od: " + od.SQL_ItemName + " od.S_CJ_NAME:" + od.S_CJ_NAME + "缁撴灉:" + (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName && _clcntitem.S_CJ_NAME == od.S_CJ_NAME));
+ if (_clcntitem.S_ITEM_CODE == od.SQL_ItemCode && _clcntitem.S_ITEM_NAME == od.SQL_ItemName)
+ {
+ StartBit = rl;
+ break;
+ }
}
}
}
if (StartBit != null)
+ {
break;
+ }
}
if (StartBit == null)
{
@@ -4110,6 +4219,11 @@
if (dsi.TryGetValue(area, out dictitems))
{
var ill = dictitems.Find(x => x.Row == rl.N_ROW && x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME && _clcntitem.S_CJ_NAME == x.S_CJ_NAME);
+ if (ill == null)
+ {
+ ill = dictitems.Find(x => x.Row == rl.N_ROW && x.ItemCode == _clcntitem.S_ITEM_CODE && x.ItemName == _clcntitem.S_ITEM_NAME);
+ }
+
if (ill != null)
{
if (rl.N_CURRENT_NUM > ill.ItemLayer)
@@ -4151,6 +4265,29 @@
LogHelper.Info($"AutoRunABD abcd鐗╂枡姹囨�瀹屾垚 >>{ReadCCK}|| {dsi.Count}");
}
+ /// <summary>
+ /// 鏍煎紡鍖栧唴瀛樻帓閿�+ /// </summary>
+ public static void Qchc()
+ {
+ try
+ {
+ LogHelper.Info($"鍐呭瓨涓殑鎺掗攣琛ㄤ腑鐨勬暟鎹� + $"{JsonConvert.SerializeObject(RGRow)}");
+ if (RGRow.Count() > 0)
+ {
+ var locs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLRGDD" && x.S_LOCK_STATE == "鍑哄簱閿�).ToList();
+ if (locs.Count() == 0)
+ {
+ RGRow = new List<RowLock>();
+ LogHelper.Info($"鏍煎紡鍖栧唴瀛樹腑鐨勬帓閿� + $"{JsonConvert.SerializeObject(RGRow)}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"鏍煎紡鍖栧唴瀛樹腑鐨勬帓閿�澶辫触" + $"{ex.Message}");
+ }
+ }
public static void chargeCCD()
{
var ods = LocationHelper.GetList<YWLWorkOrder>(x => x.WorkType == 2 && x.SQL_State == "鎵ц涓�);
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 29be3a2..a62c5bc 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -7,8 +7,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Web.Configuration;
-using System.Xml.Schema;
using static HH.WCS.QingXigongchang.api.ApiModel;
namespace HH.WCS.QingXigongchang.core
@@ -36,7 +34,7 @@
&& wmsTask.S_B_STATE.Trim() != "寮哄埗瀹屾垚"
&& wmsTask.S_B_STATE.Trim() != "鍙栨秷")
{
- if (model.State < 8 || model.State > 1000)
+ if (model.State < 10 || model.State > 1000)
{
if (model.State < 7 && string.IsNullOrEmpty(model.ForkliftNo))
{
@@ -98,6 +96,15 @@
r = TaskProcess.OperateStatus(wmsTask, 8);
if (r.ResultCode != -1)
TaskHelper.BeEnd(wmsTask);
+ break;
+ case 9://寮哄埗鍙栨秷 //璧风偣瑙ｇ粦閿侀噴鏀�缁堢偣閿侀噴鏀�+
+ r = TaskProcess.OperateStatus(wmsTask, 9);
+ if (r.ResultCode != -1)
+ {
+ wmsTask.T_END_TIME = DateTime.Now;
+ TaskHelper.UpdateStatus(wmsTask, "鍙栨秷");
+ }
break;
@@ -454,7 +461,7 @@
var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁
kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE;
- if(!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
+ if (!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME;
kr.MaxCapacity = total;
kr.FilledCapacity = count;
diff --git a/HH.WCS.QingXiNongfu/dispatch/NDC.cs b/HH.WCS.QingXiNongfu/dispatch/NDC.cs
index 473bc7e..77eca17 100644
--- a/HH.WCS.QingXiNongfu/dispatch/NDC.cs
+++ b/HH.WCS.QingXiNongfu/dispatch/NDC.cs
@@ -70,11 +70,71 @@
return new AGVResult { Res = new Res { ErrCode = -1, ErrInfo = e.Message } };
}
}
+ public static bool AddTaskNew(int ts, int pri, string taskNo, Dictionary<string, string> dic)
+ {
+ var res = NDC.AddNewOrderNew(ts, pri, taskNo, dic);
+ if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ public static AGVResult AddNewOrderNew(int ts, int pri, string taskNo, Dictionary<string, string> param)
+ {
+ //< Req >< Order TS = '1' Pri = '1' No = 'TN2302020001' Ext1 = '' Ext2 = '' N_CNTR_COUNT = '' >< Param Name = 'From' Value = '2' />< Param Name = 'To' Value = '1' /></ Order ></ Req >
+
+ var bufin = GetReqStrNew(ts, pri, taskNo, param);
+
+ try
+ {
+ LogHelper.Info($"浠诲姟涓嬪彂缁撴灉 OrderAdd req={bufin}", "NDC");
+ var result = callClient.OrderAdd(bufin);
+ LogHelper.Info($"浠诲姟涓嬪彂缁撴灉 OrderAdd req={bufin} res={result}", "NDC");
+ // Console.WriteLine($"浠诲姟涓嬪彂缁撴灉 OrderAdd req={bufin} res={result}");
+ //LogHelper.Info(result.bufout, "ts");
+ return GetResult(result);
+ }
+ catch (Exception e)
+ {
+ LogHelper.Info($"浠诲姟涓嬪彂澶辫触 OrderAdd req={bufin} res={e.Message}", "NDC");
+ //Console.WriteLine($"浠诲姟涓嬪彂澶辫触 AddNewOrder req={bufin} res={e.Message}");
+ return new AGVResult { Res = new Res { ErrCode = -1, ErrInfo = e.Message } };
+ }
+
+ }
+ private static string GetReqStrNew(int ts, int pri, string taskNo, Dictionary<string, string> param)
+ {
+ /*<Req>
+ <Order TS='5' Pri='80' No='666' NoCallback='0' Ext1='' Ext2='' Ext3=''>
+ <Param Name='From' Value='10' />
+ <Param Name='To' Value='20' />
+ <Param Name='FRow' Value='1' />
+ <Param Name='TRow' Value='7' />
+ <Param Name='DispInfo' Value='1' />
+ <Param Name='CtrlVal' Value='12' />
+ <Param Name='ChgTo' Value='2' />
+ <Param Name='Flow' Value='111' />
+ <Param Name='Tlow' Value='222' />
+ </Order>
+ </Req>*/
+ var sb = new StringBuilder();
+ sb.Append($"<Req><Order TS='{ts}' Pri='{pri}' No='{taskNo}'>");
+
+ foreach (var kv in param)
+ {
+ sb.Append($"<Param Name='{kv.Key}' Value='{kv.Value}'/>");
+ }
+ sb.Append("</Order></Req>");
+ return sb.ToString();
+ }
public static AGVResult CancelOrder(int ts, Dictionary<string, string> param, string RORDERs = "")
{
//< Req >< Order No = 'TN2302020001' >< Param Name = 'IsForce' Value = '1' /></ Order ></ Req >
- var bufin =GetReqStr(ts, param);
+ var bufin = GetReqStr(ts, param);
if (!string.IsNullOrEmpty(RORDERs))
bufin = RORDERs;// GetReqStr(ts, param);
try
diff --git a/HH.WCS.QingXiNongfu/obj/Debug/HH.WCS.QingXigongchang.csproj.FileListAbsolute.txt b/HH.WCS.QingXiNongfu/obj/Debug/HH.WCS.QingXigongchang.csproj.FileListAbsolute.txt
index a219d94..91931c7 100644
--- a/HH.WCS.QingXiNongfu/obj/Debug/HH.WCS.QingXigongchang.csproj.FileListAbsolute.txt
+++ b/HH.WCS.QingXiNongfu/obj/Debug/HH.WCS.QingXigongchang.csproj.FileListAbsolute.txt
@@ -329,3 +329,8 @@
E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\obj\Debug\HH.WCS.Q.FBA0BAD2.Up2Date
E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\obj\Debug\HH.WCS.QingXigongchang.exe
E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\obj\Debug\HH.WCS.QingXigongchang.pdb
+E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\bin\Debug\HH.WCS.QingXigongchang.exe.manifest
+E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\bin\Debug\HH.WCS.QingXigongchang.application
+E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\obj\Debug\HH.WCS.QingXigongchang.TrustInfo.xml
+E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\obj\Debug\HH.WCS.QingXigongchang.exe.manifest
+E:\GitProject\HH-0014_NongFu_QingXi\HH.WCS.QingXiNongfu\obj\Debug\HH.WCS.QingXigongchang.application
diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index 27022f3..a391ae3 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -312,7 +312,7 @@
si = "0";
}
- else if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("绾哥")) != null || plc.deviceName.Contains("T1"))
+ if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("绾哥")) != null || plc.deviceName.Contains("T1"))
{
//if (!ods.Any())
// return;
@@ -320,13 +320,22 @@
if (_cl.N_CURRENT_NUM > 0 || _clrel.Any())
{
LogHelper.Info($" time锛歿_clrel0?.T_CREATE} = s_type锛歿_clrel0.S_TYPE}");
+ //if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 10 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
+ // goto ballll;
+ //plg 2025骞�鏈�3鏃� 鍘婚櫎10绉掓椂闂撮檺鍒� if (_clrel.Any())
- //if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 10 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
- // goto ballll;
- //plg 2025骞�鏈�3鏃� 鍘婚櫎10绉掓椂闂撮檺鍒�- if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
- goto ballll;
-
+ {
+ if (od?.SQL_PLineNo == "T1鎻愬崌鏈�)
+ {
+ if (!string.IsNullOrEmpty(_clrel0.S_TYPE))
+ goto ballll;
+ }
+ else
+ {
+ if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))
+ goto ballll;
+ }
+ }
LocationHelper.DoAction(db =>
{
db.Deleteable(_clrel).ExecuteCommand();
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 098d22a..9636f3c 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -1112,6 +1112,12 @@
{
CacheBitCancelUpdate(mst, out r, true);
}
+ if (state == 9)
+ {
+ var g = LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
+ var T = LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
+ CacheBitUpdate(mst, load: true);
+ }
return r;
}
@@ -1349,6 +1355,48 @@
else return false;
}
}
+ //else if (taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満"))
+ //{
+ // var ts = 5;
+ // start = LocationHelper.GetAgvSite(mst.S_START_LOC);//璧风偣绔欑偣
+ // end = LocationHelper.GetAgvSite(mst.S_END_LOC);//缁堢偣绔欑偣
+ // var dic = new Dictionary<string, string>();
+ // dic.Add("From", start.ToString());
+ // dic.Add("To", end.ToString());
+ // dic.Add("FUNC", "0");
+ // dic.Add("DATA", "0");
+ // int height = 0;
+ // var itemcode = "";
+ // var ItemLayer = 0;
+ // var db = new SqlHelper<object>().GetInstance();
+ // var cirs = ContainerHelper.GetCntrItemRel(mst.S_CNTRS.Split(',').ToList().FirstOrDefault()).First();
+ // LogHelper.Info($"鍘熺墿鏂�鏀剁缉鑶滃弶杩�瀹瑰櫒鐗╂枡琛ㄦ暟鎹畕JsonConvert.SerializeObject(cirs)}", "HosttoagvTask");
+ // if (cirs != null)
+ // {
+ // var ItemF = db.Queryable<ItemInfo>().Where(a => a.S_ITEM_CODE == cirs.S_ITEM_CODE).First();
+ // itemcode = ItemF.S_ITEM_CODE;
+ // ItemLayer = ItemF.ItemLayer;
+ // if (mst.N_START_LAYER < 3 || mst.N_END_LAYER < 3)
+ // {
+ // height = ItemF.trayHeight;
+ // }
+ // else
+ // {
+ // height = ItemF.trayHeight1;
+ // }
+ // }
+ // dic.Add("ItemHeight", height.ToString());
+ // dic.Add("StaItemHeight", "0");
+ // dic.Add("TrayType", $"{mst.N_START_LAYER}{mst.N_END_LAYER}");
+ // var ggh = NDC.AddTaskNew(ts, mst.N_PRIORITY, mst.S_TASK_NO, dic);
+ // if (ggh)
+ // {
+ // TaskHelper.UpdateStatus(mst, "宸叉帹閫�);
+ // result = true;
+ // GeneralInterFaceFunc(mst, 8 + "");
+ // }
+ //}
+
//else if ( mst.S_END_LAREA == "WJBQDDKQ" || mst.S_END_LAREA == "SXBQDDKQ"|| mst.S_START_LAREA == "WJBQDDKQ" ||mst.S_START_LAREA == "SXBQDDKQ" )
//{
// if (start == 0)
diff --git a/HH.WCS.QingXiNongfu/settings.xml b/HH.WCS.QingXiNongfu/settings.xml
index 429ad92..c20275e 100644
--- a/HH.WCS.QingXiNongfu/settings.xml
+++ b/HH.WCS.QingXiNongfu/settings.xml
@@ -128,7 +128,7 @@
{"address":"10.140.3.187","deviceName":"鐡剁洊5L缈绘枟鏈�,"deviceNo":["","187"],"location":["SXFDJ-1"],"deviceType":10,"areaPriy":["PGMKCK"],"enable":1},
{"address":"10.140.3.170","deviceName":"T2鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
- {"address":"10.140.8.65","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
+ {"address":"10.140.9.167","deviceName":"T1鎻愬崌鏈�,"deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
]]]>
diff --git a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
index dc6c1d0..bd066fb 100644
--- a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
@@ -1,17 +1,11 @@
锘縰sing HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using SqlSugar;
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using static HH.WCS.QingXigongchang.dispatch.NDC;
namespace HH.WCS.QingXigongchang.wms
{
diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
index caf3060..5ac2008 100644
--- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
@@ -504,6 +504,7 @@
[SuGG("搴撳簱杞繍")]
public class YWLZXtake : BaseModel
{
+ public string SQL_WorkNo { get; set; }
public string S_START_AREA { get; set; }
public int N_START_ROW { get; set; }
public string S_ZZ_AREA { get; set; }
diff --git a/HH.WCS.QingXiNongfu/wms/WMSModel.cs b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
index d8d5d2e..decb39d 100644
--- a/HH.WCS.QingXiNongfu/wms/WMSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WMSModel.cs
@@ -290,6 +290,11 @@
public string S_ITEM_CODE { get; set; }
public string S_ITEM_NAME { get; set; }
public int trayHeight { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡pe鑶滀笁灞俆S楂樺害
+ /// </summary>
+ public int trayHeight1 { get; set; }
public int ItemLayer { get; set; }
//鐗╂枡鎵�湪鎵樼洏鐨勫彲鍫嗗彔灞傛暟銆� 銆娿�涓庤揣浣嶅閲忓彇 鏈�皬鍊笺�
--
Gitblit v1.9.1