|
@@ -28,7 +28,7 @@ namespace WCS.Service.Works.Stations
|
|
|
var station = dev.Entity.CODE;
|
|
|
|
|
|
short outTemp = 0, inTemp = 0;
|
|
|
-
|
|
|
+
|
|
|
Device<IStation521, IStation520>[] arr = null;
|
|
|
|
|
|
string trafficControl = "";
|
|
@@ -115,7 +115,6 @@ namespace WCS.Service.Works.Stations
|
|
|
arr = Device.Find("3060", "3005", "3004", "3001").Select(v => v.Device<IStation521, IStation520>()).ToArray();
|
|
|
|
|
|
if (Ltc.Do(dev, v => v.Data.GOODSEND != inTemp)) return;
|
|
|
-
|
|
|
|
|
|
var inTempDev = Device.Find(inTemp.ToString()).Device<IStation521>();
|
|
|
if (inTempDev.Data.TASKNUM < 10000)
|
|
@@ -133,8 +132,8 @@ namespace WCS.Service.Works.Stations
|
|
|
var toDev = Device.Find(addrTo.ToString()).Device<IStation521>();
|
|
|
if (toDev.Data.PH_STATUS)
|
|
|
{
|
|
|
- if (toDev.Data.TASKNUM < 10000)return;
|
|
|
- if (toDev.Data.GOODSEND != toDev.Entity.Code() ) return;
|
|
|
+ if (toDev.Data.TASKNUM < 10000) return;
|
|
|
+ if (toDev.Data.GOODSEND != toDev.Entity.Code()) return;
|
|
|
}
|
|
|
|
|
|
if (arr.Where(v => v.Data.GOODSEND == outTemp || (v.Entity.CODE == "3060" && v.Data.PH_STATUS && v.Data.GOODSEND == 0)).Any())
|
|
@@ -176,6 +175,7 @@ namespace WCS.Service.Works.Stations
|
|
|
if (Ltc.Do(dev, v => v.Data2.CONFIRM == true)) return;
|
|
|
if (Ltc.Do(dev, v => v.Data.TASKNUM == 0)) return;
|
|
|
if (Ltc.Do(dev, v => v.Data.PH_STATUS == false)) return;
|
|
|
+ if (!Ltc.Do(dev, v => v.Data.REQUEST == false)) return;
|
|
|
|
|
|
// 没有准备放货的入库任务
|
|
|
DB.Do(db =>
|