From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 138 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 135 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
index 8a14bce..7b5555e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
@@ -3,7 +3,14 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_BasicRepository;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.MaterielEnum;
+using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -12,17 +19,31 @@
{
public partial class MaterielInfoService : ServiceBase<Dt_MaterielInfo, IMaterielInfoRepository>, IMaterielInfoService
{
-
+ /// <summary>
+ /// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ /// </summary>
+ /// <param name="materielCode">鐗╂枡缂栧彿</param>
+ /// <returns></returns>
public bool ExsitMateriel(string materielCode)
{
return BaseDal.QueryFirst(x => x.MaterielCode == materielCode) != null;
}
+ /// <summary>
+ /// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ /// </summary>
+ /// <param name="materielCodes">鐗╂枡缂栧彿闆嗗悎</param>
+ /// <returns></returns>
public bool ExsitMateriels(List<string> materielCodes)
{
- return BaseDal.QueryFirst(x => materielCodes.Contains(x.MaterielCode)) != null;
+ return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode)).Count == materielCodes.Count;
}
+ /// <summary>
+ /// 鑾峰彇鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="materielCode">鐗╂枡缂栧彿</param>
+ /// <returns></returns>
public Dt_MaterielInfo GetMaterielInfo(string materielCode)
{
return BaseDal.QueryFirst(x => x.MaterielCode == materielCode);
@@ -31,11 +52,122 @@
/// <summary>
/// 鏌ヨ鐗╂枡淇℃伅
/// </summary>
- /// <param name="materielCodes"></param>
+ /// <param name="materielCodes">鐗╂枡缂栧彿</param>
/// <returns></returns>
public List<Dt_MaterielInfo> GetMaterielInfos(List<string> materielCodes)
{
return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode));
}
+
+ public WebResponseContent GetWarehouseMaterielInfos(int warehouseId)
+ {
+ try
+ {
+ List<Dt_MaterielInfo> materielInfos = BaseDal.QueryData(x => x.WarehouseId == warehouseId);
+ return WebResponseContent.Instance.OK(data: materielInfos);
+ }
+ 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