From df97e66f99cf081abf212a8d97fc32afe9c6e7a7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 一月 2025 13:46:32 +0800
Subject: [PATCH] 更新配置文件PDA版本
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 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 c449ae2..df5f06c 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"
@@ -8,7 +8,9 @@
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;
@@ -17,16 +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);
@@ -35,41 +52,67 @@
/// <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
{
- if (model.OperateType == 0)
+ Dt_Warehouse? warehouse = null;
+ if (model.ItemType.ObjToInt() == MaterielTypeEnum.RawMateriel.ObjToInt())
+ {
+ warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒颁粨搴撲俊鎭�");
+ }
+ }
+ if (model.OperateType.ObjToInt() == 0)
{
Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
{
- IsCheck = (WhetherEnum)model.IsCheck,
+ 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,
- MaterielSpec = "model.",
- MaterielState = (EnableEnum)model.State,
+ MaterielSourceType = (MaterielSourceTypeEnum)(model.ItemSourceType.ObjToInt()),
+ MaterielSpec = warehouse == null ? "绌�" : model.StandType,
+ MaterielState = (EnableEnum)(model.State.ObjToInt()),
MaterielThickness = model.Thickness,
- MaterielType = (MaterielTypeEnum)model.ItemType,
- MaterielUnit = model.Unit,
+ MaterielType = (MaterielTypeEnum)(model.ItemType.ObjToInt()),
+ MaterielUnit = model.Unit == null ? "" : model.Unit,
MaterielVersion = model.MaterialVersion,
MaterielWide = model.Wide,
- WarehouseId = model.WaId,
+ WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
};
BaseDal.AddData(materielInfo);
}
- else if (model.OperateType == 1)
+ else if (model.OperateType.ObjToInt() == 1)
{
Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
if (materielInfo == null)
@@ -77,25 +120,25 @@
return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
}
- materielInfo.IsCheck = (WhetherEnum)model.IsCheck;
+ 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;
- materielInfo.MaterielSpec = model.StandType;
- materielInfo.MaterielState = (EnableEnum)model.State;
+ 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;
- materielInfo.MaterielUnit = model.Unit;
+ materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType.ObjToInt();
+ materielInfo.MaterielUnit = model.Unit == null ? "" : model.Unit;
materielInfo.MaterielVersion = model.MaterialVersion;
materielInfo.MaterielWide = model.Wide;
- materielInfo.WarehouseId = model.WaId;
+ materielInfo.WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId;
BaseDal.UpdateData(materielInfo);
}
- else if (model.OperateType == 2)
+ else if (model.OperateType.ObjToInt() == 2)
{
Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
if (materielInfo == null)
@@ -109,7 +152,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.OK(ex.Message);
}
}
}
--
Gitblit v1.9.3