From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序，ERP代码，MES代码等
---
项目代码/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs | 146 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 136 insertions(+), 10 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..e57f1b0 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"
@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -40,19 +41,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.BeginTran();
+ BaseDal.AddData(materielInfosAdd);
+ BaseDal.UpdateData(materielInfosUpdate);
+ _unitOfWorkManage.CommitTran();
return content.OK("鎺ユ敹鎴愬姛");
}
catch (Exception ex)
@@ -62,6 +116,78 @@
}
return content;
}
-
+ /// <summary>
+ /// 娣诲姞浜屾湡鐗╂枡
+ /// </summary>
+ /// <param name="eRPMaterialDTOs"></param>
+ /// <returns></returns>
+ public WebResponseContent ReceiveMaterial(ERPMaterialDTO eRPMaterialDTO)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (eRPMaterialDTO==null)
+ {
+ return content.Error("鐗╂枡淇℃伅涓嶈兘浼犲叆涓虹┖");
+ }
+ List<Dt_MaterielInfo> OldMaterielInfos = BaseDal.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
+ Dt_Warehouse warehouse=_basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode== eRPMaterialDTO.WarehouseCode);
+ if (warehouse==null)
+ {
+ return content.Error($"鏈壘鍒颁粨搴撲唬鍙�:{eRPMaterialDTO.WarehouseCode}");
+ }
+ if (eRPMaterialDTO.OperateType==1)
+ {
+ //鍒ゆ柇閲嶅鎻掑叆
+ Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => x.MaterielCode == eRPMaterialDTO.MaterielNo);
+ if (ExistMaterial != null)
+ {
+ return content.Error($"鐗╂枡{ExistMaterial.MaterielCode}宸插瓨鍦�");
+ }
+ Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(eRPMaterialDTO);
+ materielInfo.WarehouseId = warehouse.WarehouseId;
+ BaseDal.AddData(materielInfo);
+ }
+ else if (eRPMaterialDTO.OperateType == 2)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => x.MaterielCode == eRPMaterialDTO.MaterielNo);
+ if (ExistMaterial == null)
+ {
+ return content.Error($"鏇存柊鐗╂枡{eRPMaterialDTO.MaterielNo}涓嶅瓨鍦�");
+ }
+ Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(eRPMaterialDTO);
+ materielInfo.WarehouseId = warehouse.WarehouseId;
+ materielInfo.Id = ExistMaterial.Id;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.UpdateData(materielInfo);
+ _unitOfWorkManage.CommitTran();
+ }
+ else if (eRPMaterialDTO.OperateType == 3)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => x.MaterielCode == eRPMaterialDTO.MaterielNo);
+ if (ExistMaterial == null)
+ {
+ return content.Error($"鏇存柊鐗╂枡{eRPMaterialDTO.MaterielNo}涓嶅瓨鍦�");
+ }
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteData(ExistMaterial);
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ return content.Error("鏈壘鍒版搷浣滅被鍨�");
+ }
+ //鏇存柊鏁版嵁
+ return content.OK("鎺ユ敹鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3