From b7bb4bf8ee6d007e0e7c3cacfc4fab77049beb58 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 20 8月 2025 17:08:43 +0800
Subject: [PATCH] 同步代码
---
DEmon/iWareCc/DecomposeTask/Strategy/出库任务/Chain/判断堆垛机是否空闲.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git "a/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs" "b/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs"
index 22d4b52..20e6b5b 100644
--- "a/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs"
+++ "b/DEmon/iWareCc/DecomposeTask/Strategy/\345\207\272\345\272\223\344\273\273\345\212\241/Chain/\345\210\244\346\226\255\345\240\206\345\236\233\346\234\272\346\230\257\345\220\246\347\251\272\351\227\262.cs"
@@ -51,12 +51,12 @@
string msg;
- if (!stacker.CanDecomposeTask(out msg))
- {
- ResultContainer.Msg = msg;
- LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "鍒ゆ柇涓庝换鍔″尮閰嶇殑鍫嗗灈鏈烘槸鍚︾┖闂�:{0}", msg);
- return;
- }
+ //if (!stacker.CanDecomposeTask(out msg))
+ //{
+ // ResultContainer.Msg = msg;
+ // LogTextHelper.WriteLine(Resources.LogDir + @"/鍒嗚В浠诲姟娴佺▼", "鍒ゆ柇涓庝换鍔″尮閰嶇殑鍫嗗灈鏈烘槸鍚︾┖闂�:{0}", msg);
+ // return;
+ //}
var conveyor = CacheEntity.Conveyors.FirstOrDefault(x => x.Equipment.EquipName == "conveyor2");
var gate = conveyor.Gates.FirstOrDefault(x => x.Place.PlaceTypeName == "gate21");
--
Gitblit v1.9.3