From 7154cc02c0fa9ef6786a19da0281bf6982fa61bd Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期一, 30 三月 2026 16:02:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
index a023b44..830bd19 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
@@ -41,12 +41,12 @@
{
//娑傝涓嶇敓浜� 鍒欏仠姝㈡媺鍔ㄥ嚭搴�
var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "2");
- if (area.AreaStatus != 1l) { return Task.CompletedTask; }
+ if (area.AreaStatus != 1) { return Task.CompletedTask; }
var stockInfo = _palletStockInfoRepository.Db.Queryable<Dt_PalletStockInfo>()
//.Where(x => x.LockStatue == 0)
.Includes(x => x.CarBodyInfo)
- .Where(x => x.CarBodyInfo.CarType == 1 && x.TaskStatus == 0)
+ .Where(x => x.CarBodyInfo.CarType == 1 && x.TaskStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0)
.OrderBy(x => x.CreateDate) // 鎺掑簭
.ToList(); // 鑾峰彇绗竴涓厓绱�
@@ -73,7 +73,7 @@
var location = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
location.LocationStatus = (int)LocationEnum.InStockDisable;
lockStock.TaskStatus = 1;
- if (stationLists == null || stationLists.Count == 0) throw new Exception("鍑哄簱绔欏彴鏈厤缃垨鏈惎鐢�");
+ if (!stationLists.Any()) throw new Exception("鍑哄簱绔欏彴鏈厤缃垨鏈惎鐢�");
Dt_StationManager Outstation = null;
@@ -92,7 +92,7 @@
// 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
hasTask = new Dt_Task
{
- Grade = 1,
+ Grade = 3,
Roadway = Outstation.Roadway,
TargetAddress = Outstation.stationChildCode,
Dispatchertime = DateTime.Now,
@@ -109,6 +109,7 @@
CreateDate = DateTime.Now,
TaskId = 0,
CarType = stock.CarType,
+ RoadwayNo = stock.RoadwayNo
};
// 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
--
Gitblit v1.9.3