From ed82ad3a75afb740911cd9128fbada56566a571f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 09:15:33 +0800
Subject: [PATCH] 040310 许工说这个工位机器人达不到，强行锁定 【Editby shaocx,2024-12-23】
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs | 210 +++++++++++++++++-----------------------------------
1 files changed, 68 insertions(+), 142 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs
index f6dec3e..92cd06f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs
@@ -12,12 +12,9 @@
public class WmsBasePlaceService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WmsBasePlace> _rep;
- private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan;
- public WmsBasePlaceService(SqlSugarRepository<WmsBasePlace> rep,
- SqlSugarRepository<V_Station_Quan> V_Station_Quan_Rep)
+ public WmsBasePlaceService(SqlSugarRepository<WmsBasePlace> rep)
{
_rep = rep;
- _V_Station_Quan = V_Station_Quan_Rep;
}
/// <summary>
@@ -95,7 +92,7 @@
var entity = input.Adapt<WmsBasePlace>();
//閲嶅鎬ч獙璇�
- await CheckExist(entity, true);
+ await CheckExist(entity,true);
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
@@ -142,152 +139,81 @@
.WhereIF(input.PlaceType.HasValue, u => u.PlaceType == input.PlaceType)
.WhereIF(!string.IsNullOrWhiteSpace(input.PlaceTypeName), u => u.PlaceTypeName.Contains(input.PlaceTypeName.Trim()))
.WhereIF(input.PlaceStatus.HasValue, u => u.PlaceStatus == input.PlaceStatus)
- .WhereIF(input.AreaId > 0, u => u.AreaId == input.AreaId)
+ .WhereIF(input.AreaId>0, u => u.AreaId == input.AreaId)
.WhereIF(!string.IsNullOrWhiteSpace(input.AreaCode), u => u.AreaCode.Contains(input.AreaCode.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.AreaName), u => u.AreaName.Contains(input.AreaName.Trim()))
- .WhereIF(input.ColumnNo > 0, u => u.ColumnNo == input.ColumnNo)
- .WhereIF(input.LayerNo > 0, u => u.LayerNo == input.LayerNo)
- .WhereIF(input.LaneNo > 0, u => u.LaneNo == input.LaneNo)
+ .WhereIF(input.ColumnNo>0, u => u.ColumnNo == input.ColumnNo)
+ .WhereIF(input.LayerNo>0, u => u.LayerNo == input.LayerNo)
+ .WhereIF(input.LaneNo>0, u => u.LaneNo == input.LaneNo)
.WhereIF(input.IsVirtually.HasValue, u => u.IsVirtually == input.IsVirtually)
.WhereIF(input.IsDisabled.HasValue, u => u.IsDisabled == input.IsDisabled)
.Select<WmsBasePlaceOutput>();
- return query;
- }
-
- /// <summary>
- /// 閲嶅鎬ч獙璇�
- /// </summary>
- /// <param name="input">楠岃瘉瀵硅薄</param>
- /// <param name="isEdit">鏄惁鏄紪杈�</param>
- /// <returns></returns>
- private async Task CheckExist(WmsBasePlace input, bool isEdit = false)
- {
-
-
-
- //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
-
-
- //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
- }
-
- /// <summary>
- /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<WmsBasePlace> inputs)
- {
- if (inputs?.Count <= 0)
+ if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
{
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
- }
- #endregion
-
-
- /// <summary>
- /// 鎵归噺澧炲姞璐т綅鍩虹淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "BatchAdd")]
- public async Task BatchAdd()
- {
- List<WmsBasePlace> places = new List<WmsBasePlace>();
-
- for (int aisle = 1; aisle <= 6; aisle++)//鎺�
- {
- for (int column = 1; column <= 20; column++)//鍒�
+ DateTime? start= input.CreateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
+ if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
{
- for (int layer = 1; layer <= 3; layer++)//灞�
- {
- PlaceTypeEnum placeTypeEnum = default(PlaceTypeEnum);
-
- if (layer == 1)
- {
- placeTypeEnum = PlaceTypeEnum.涓揣浣�;
- }
- else if (layer == 2)
- {
- placeTypeEnum = PlaceTypeEnum.灏忚揣浣�;
- }
- else if (layer == 3)
- {
- placeTypeEnum = PlaceTypeEnum.澶ц揣浣�;
- }
-
- WmsBasePlace place = new WmsBasePlace();
- place.PlaceType = placeTypeEnum;
- place.PlaceTypeName = placeTypeEnum.ToString();
- place.PlaceCode = aisle.ToString("00") + layer.ToString("00") + column.ToString("00");
- place.PlaceName = aisle.ToString("00") + layer.ToString("00") + column.ToString("00");
- place.AreaCode = "";
- place.PlaceStatus = PlaceStatusEnum.姝ｅ父;
- place.AreaName = "鏈哄櫒浜哄矝缂撳瓨鍖�";
- place.ColumnNo = column;
- place.LayerNo = layer;
- //place.DeepcellNo = 0;
- //place.GoodsShelfNo = "";
- place.LaneNo = aisle;
- place.IsVirtually = false;
- //place.Line = 0;
- //place.Islock = (int)YesNoEnum.N;
- //place.EmptyContainer = (int)YesNoEnum.Y;
- //place.PositionnoForSrm = "";
-
- place.Length = new decimal(100);
- place.Width = new decimal(100);
- place.Height = new decimal(000);
- //place.MaxWeight = 630;
- //place.HeightLevel = (int)Heightlevel.DI;
- //place.Priority = (int)PlacePriority.GAO;
- places.Add(place);
- }
+ var end = input.CreateTimeRange[1].Value;
+ query = query.Where(u => u.CreateTime <= end);
}
- }
-
-
- await _rep.InsertRangeAsync(places);
- }
-
- /// <summary>
- /// 涓嶅垎椤垫煡璇㈠簱浣嶄俊鎭�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "ListView")]
- [Description("WmsBasePlace/ListView")]
- public async Task<List<LocationViewOutput>> ListView([FromQuery] WmsBasePlaceInput input)
- {
- var query = await _V_Station_Quan.AsQueryable()
- .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
- u.PlaceCode.Contains(input.SearchKey.Trim())
- // || u.WareContainerCode.Contains(input.SearchKey.Trim())
- //|| u.Lane==input.Lane
- //|| u.Row==input.Row
- )
- .OrderBy(u => u.LaneNo)
- //.OrderBy(u => u.Row)
- .OrderBy(u => u.LayerNo)
- .OrderBy(u => u.ColumnNo)
- .Select<LocationViewOutput>().ToListAsync();
+ }
+ if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
+ {
+ DateTime? start= input.UpdateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
+ if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
+ {
+ var end = input.UpdateTimeRange[1].Value;
+ query = query.Where(u => u.UpdateTime <= end);
+ }
+ }
return query;
- }
+ }
+
+ /// <summary>
+ /// 閲嶅鎬ч獙璇�
+ /// </summary>
+ /// <param name="input">楠岃瘉瀵硅薄</param>
+ /// <param name="isEdit">鏄惁鏄紪杈�</param>
+ /// <returns></returns>
+ private async Task CheckExist( WmsBasePlace input,bool isEdit=false)
+ {
+
+
+
+ //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
+
+
+ //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
+ /// </summary>
+ /// <param name="inputs"></param>
+ /// <returns></returns>
+ private async Task CheckExisitForImport(List<WmsBasePlace> inputs)
+ {
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+
+
+
+
+
+ //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+
+
+
+ }
+ #endregion
}
--
Gitblit v1.9.3