From fb745c842df36edc5101291a7f239c11c97bcc2f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 11 九月 2025 16:46:33 +0800
Subject: [PATCH] 最新代码更新，BST，MES部分
---
项目代码/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
index 2c00040..f65da62 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
@@ -40,19 +40,72 @@
try
{
List<Dt_MaterielInfo> OldMaterielInfos = BaseDal.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt());
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => bSTMaterialDTOs.Where(x => x.Way == 1).Select(x => x.MaterialId).Contains(x.MaterialSourceId));
- if (ExistMaterial != null)
+ //鏂板
+ List<BSTMaterialDTO> bSTMaterialsDTOAdd = bSTMaterialDTOs.Where(x => x.Way == 1).ToList();
+ //淇敼
+ List<BSTMaterialDTO> bSTMaterialsDTOUpdate = bSTMaterialDTOs.Where(x => x.Way == 2).ToList();
+ //鍒犻櫎
+ List<BSTMaterialDTO> bSTMaterialsDTODel = bSTMaterialDTOs.Where(x => x.Way == 3).ToList();
+ List<Dt_MaterielInfo> materielInfosAdd = new List<Dt_MaterielInfo>();
+ List<Dt_MaterielInfo> materielInfosUpdate = new List<Dt_MaterielInfo>();
+ //鏂板
+ if (bSTMaterialsDTOAdd.Count>0)
{
- return content.Error($"鐗╂枡Id{nameof(BSTMaterialDTO.MaterialId)}:{ExistMaterial.MaterialSourceId}宸插瓨鍦�");
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => bSTMaterialsDTOAdd.Select(x => x.MaterialId).Contains(x.MaterialSourceId));
+ if (ExistMaterial != null)
+ {
+ return content.Error($"鐗╂枡{nameof(BSTMaterialDTO.MaterialId)}:{ExistMaterial.MaterialSourceId}宸插瓨鍦�");
+ }
+
+ foreach (var item in bSTMaterialsDTOAdd)
+ {
+ if (bSTMaterialsDTOUpdate.FirstOrDefault(x=>x.MaterialId==item.MaterialId)!=null)
+ {
+ continue;
+ }
+ Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(item);
+ materielInfosAdd.Add(materielInfo);
+ }
}
- List<Dt_MaterielInfo> materielInfos = new List<Dt_MaterielInfo>();
- foreach (var item in bSTMaterialDTOs)
+ //鏇存柊
+ if (bSTMaterialsDTOUpdate.Count > 0)
{
- Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(item);
- materielInfos.Add(materielInfo);
+ //鑾峰彇宸插瓨鍦ㄧ殑鐗╂枡
+ List<Dt_MaterielInfo>? ExistbSTMaterialsUpdate = OldMaterielInfos.Where(x => bSTMaterialsDTOUpdate.Select(x => x.MaterialId).Contains(x.MaterialSourceId)).ToList();
+ foreach (var item in bSTMaterialsDTOUpdate)
+ {
+ Dt_MaterielInfo? materielInfoUpdate = ExistbSTMaterialsUpdate.FirstOrDefault(x => x.MaterialSourceId == item.MaterialId);
+ //濡傛灉鐗╂枡宸插瓨鍦ㄥ垯杩涜鏇存敼
+ if (materielInfoUpdate!=null)
+ {
+ materielInfoUpdate.MaterielCode = item.MaterialNo;
+ materielInfoUpdate.MaterielName = item.Name;
+ materielInfoUpdate.MaterielSpec = item.Spec;
+ materielInfoUpdate.MaterielWide = item.MaterielWide;
+ materielInfoUpdate.MaterielThickness = item.MaterielThickness;
+ materielInfoUpdate.MaterielLength = item.MaterielLength;
+ materielInfoUpdate.MaterielWeight = item.Weight;
+ materielInfoUpdate.MaterielUnit = item.Unit;
+ materielInfosUpdate.Add(materielInfoUpdate);
+ }
+ else//濡傛灉涓嶅瓨鍦ㄥ垯杩涜鏂板
+ {
+ Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(item);
+ materielInfosAdd.Add(materielInfo);
+ }
+ }
}
- BaseDal.AddData(materielInfos);
+ //鍒犻櫎
+ if (bSTMaterialsDTODel.Count > 0)
+ {
+
+ }
+ //鏇存柊鏁版嵁
+ _unitOfWorkManage.CommitTran();
+ BaseDal.AddData(materielInfosAdd);
+ BaseDal.UpdateData(materielInfosUpdate);
+ _unitOfWorkManage.CommitTran();
return content.OK("鎺ユ敹鎴愬姛");
}
catch (Exception ex)
--
Gitblit v1.9.3