From d88884b7072dff4269626c600ef11f9bb42dd9e3 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期六, 15 十一月 2025 17:04:28 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs"
index 5ca706b..1fd25c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs"
@@ -89,22 +89,42 @@
var lists = _warehouseArearepository.Db.Queryable<Dt_WarehouseArea>().ToList();
foreach (var item in models)
{
- var dbfirst = lists.FirstOrDefault(x => x.Code == item.Code);
- if (dbfirst != null)
+ if (item.IsDelete == 1)
{
- dbfirst.Code = item.Code;
- dbfirst.Name = item.Name;
- dbfirst.FactoryArea = item.FactoryArea;
- _warehouseArearepository.UpdateData(dbfirst);
+ var first= _warehouseArearepository.Db.Queryable<Dt_WarehouseArea>().First(x => x.Code == item.Code);
+ if(first != null)
+ {
+ _warehouseArearepository.DeleteData(first);
+ }
}
else
{
- _warehouseArearepository.AddData(new Dt_WarehouseArea { Code=item.Code,Name=item.Name,FactoryArea=item.FactoryArea});
+ var dbfirst = lists.FirstOrDefault(x => x.Code == item.Code);
+ if (dbfirst != null)
+ {
+ dbfirst.Code = item.Code;
+ dbfirst.Name = item.Name;
+ dbfirst.FactoryArea = item.FactoryArea;
+ _warehouseArearepository.UpdateData(dbfirst);
+ }
+ else
+ {
+ _warehouseArearepository.AddData(new Dt_WarehouseArea { Code = item.Code, Name = item.Name, FactoryArea = item.FactoryArea });
+ }
}
}
return WebResponseContent.Instance.OK();
}
+
+ public List<WarehouseDTO> GetWarehouseTypes()
+ {
+ return _warehouseArearepository.Db.Queryable<Dt_WarehouseArea>().Select(x => new WarehouseDTO
+ {
+ WarehouseType = x.Code,
+ WarehouseTypeDesc = $"{x.Code}-{x.Name}"
+ }).ToList();
+ }
}
}
--
Gitblit v1.9.3