From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码，ERP接口，MES接口优化，WMS业务优化等
---
项目代码/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs | 103 ++-------------------------------------------------
1 files changed, 5 insertions(+), 98 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs"
index 7b5555e..1415895 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs"
@@ -59,6 +59,11 @@
return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode));
}
+ /// <summary>
+ /// 鑾峰彇搴撳尯鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="warehouseId"></param>
+ /// <returns></returns>
public WebResponseContent GetWarehouseMaterielInfos(int warehouseId)
{
try
@@ -69,104 +74,6 @@
catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- /// <summary>
- /// 鎺ユ敹ERP鐗╂枡淇℃伅
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public WebResponseContent ReceiveMaterial(MaterielInfoDTO model)
- {
- try
- {
- Dt_Warehouse? warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
- if (model.OperateType.ObjToInt() == 0)
- {
- Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
- {
- IsCheck = warehouse == null ? 0 : (WhetherEnum)model.IsCheck,
- MaterielCode = model.Code,
- MaterielInvOrgId = model.InvOrgId,
- MaterielLength = model.Length,
- MaterielModel = model.Model,
- MaterielName = model.Name,
- MaterielSize = model.Size,
- MaterielSourceType = (MaterielSourceTypeEnum)(model.ItemSourceType.ObjToInt()),
- MaterielSpec = warehouse == null ? "绌�" : model.StandType,
- MaterielState = (EnableEnum)(model.State.ObjToInt()),
- MaterielThickness = model.Thickness,
- MaterielType = (MaterielTypeEnum)(model.ItemType.ObjToInt()),
- MaterielUnit = model.Unit == null ? "" : model.Unit,
- MaterielVersion = model.MaterialVersion,
- MaterielWide = model.Wide,
- WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
- };
- BaseDal.AddData(materielInfo);
- }
- else if (model.OperateType.ObjToInt() == 1)
- {
- Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
- if (materielInfo == null)
- {
- Dt_MaterielInfo materielInfoAddNew = new Dt_MaterielInfo()
- {
- IsCheck = warehouse == null ? 0 : (WhetherEnum)model.IsCheck,
- MaterielCode = model.Code,
- MaterielInvOrgId = model.InvOrgId,
- MaterielLength = model.Length,
- MaterielModel = model.Model,
- MaterielName = model.Name,
- MaterielSize = model.Size,
- MaterielSourceType = (MaterielSourceTypeEnum)(model.ItemSourceType.ObjToInt()),
- MaterielSpec = warehouse == null ? "绌�" : model.StandType,
- MaterielState = (EnableEnum)(model.State.ObjToInt()),
- MaterielThickness = model.Thickness,
- MaterielType = (MaterielTypeEnum)(model.ItemType.ObjToInt()),
- MaterielUnit = model.Unit == null ? "" : model.Unit,
- MaterielVersion = model.MaterialVersion,
- MaterielWide = model.Wide,
- WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
- };
- BaseDal.AddData(materielInfoAddNew);
- }
- else
- {
- materielInfo.IsCheck = warehouse == null ? 0 : (WhetherEnum)model.IsCheck;
- materielInfo.MaterielCode = model.Code;
- materielInfo.MaterielInvOrgId = model.InvOrgId;
- materielInfo.MaterielLength = model.Length;
- materielInfo.MaterielModel = model.Model;
- materielInfo.MaterielName = model.Name;
- materielInfo.MaterielSize = model.Size;
- materielInfo.MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType.ObjToInt();
- materielInfo.MaterielSpec = warehouse == null ? "" : model.StandType;
- materielInfo.MaterielState = (EnableEnum)model.State.ObjToInt();
- materielInfo.MaterielThickness = model.Thickness;
- materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType.ObjToInt();
- materielInfo.MaterielUnit = model.Unit == null ? "" : model.Unit;
- materielInfo.MaterielVersion = model.MaterialVersion;
- materielInfo.MaterielWide = model.Wide;
- materielInfo.WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId;
- BaseDal.UpdateData(materielInfo);
- }
-
- }
- else if (model.OperateType.ObjToInt() == 2)
- {
- Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
- if (materielInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
- }
-
- BaseDal.DeleteData(materielInfo);
- }
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.OK(ex.Message);
}
}
}
--
Gitblit v1.9.3