From 1e6a3ce80c38124fe8750f59956528204e696d4e Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期三, 22 四月 2026 15:13:25 +0800
Subject: [PATCH] 新功能
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index 917e5c8..72f5476 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -101,13 +101,14 @@
locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free).OrderBy(x => x.Column).OrderBy(x => x.Layer).First();
}
//椋熷搧鍖哄垎閰�
- else if(k == 2)
+ else if (k == 2)
{
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Food).OrderBy(x=>x.Column).OrderBy(x => x.Layer).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Food).OrderBy(x => x.Column).OrderBy(x => x.Layer).First();
}
//宸ヤ笟鍖哄垎閰�
- else if(k == 3){
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Industry).OrderBy(x=>x.Column).OrderBy(x => x.Layer).First();
+ else if (k == 3)
+ {
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Industry).OrderBy(x => x.Column).OrderBy(x => x.Layer).First();
}
return locationInfo;
}
@@ -121,7 +122,7 @@
{
locationInfo = BaseDal.QueryFirst(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.EmptyBarrel);
}
- else if(k == 2)
+ else if (k == 2)
{
}
@@ -133,7 +134,7 @@
{
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
int k = StockInfo.Count() - 1;
- for(int i = 0; i <= k; i++)
+ for (int i = 0; i <= k; i++)
{
Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationCode == StockInfo[i].LocationCode);
locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -155,11 +156,20 @@
WebResponseContent content = new WebResponseContent();
List<Dt_LocationInfo> location = BaseDal.QueryData(x => x.Column == k);
int s = 0;
+
+ foreach (var item in location)
+ {
+ if (item.LocationStatus == (int)LocationStatusEnum.InStock || item.LocationStatus == (int)LocationStatusEnum.Lock)
+ {
+ content.Message = "淇敼鐨勮揣浣嶄笉寰楁湁閿佸畾鍜屾湁璐�";
+ return content;
+ }
+ }
if (location[0].LocationType == (int)LocationTypeEnum.Food)
{
s = (int)LocationTypeEnum.Industry;
}
- else if(location[0].LocationType == (int)LocationTypeEnum.Industry)
+ else if (location[0].LocationType == (int)LocationTypeEnum.Industry)
{
s = (int)LocationTypeEnum.Food;
}
--
Gitblit v1.9.3