From 7d5e208f291c57e8d4c49c0c965cc6c736f9b31a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 31 一月 2024 17:31:32 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index 4a64bfb..e33d8b6 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -9,25 +9,28 @@
using AutoMapper;
using Model.ModelDto.SysDto;
using SqlSugar;
+using WMS.DAL;
+using WMS.Entity.Context;
using WMS.Entity.SysEntity;
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
namespace WMS.BLL.SysServer
{
- public class MaterialsServer : IMaterialsServer
+ public class MaterialsServer : DbHelper<SysMaterialCategory>, IMaterialsServer
{
/// <summary>
/// 渚濊禆娉ㄥ叆
/// </summary>
public IMaterialsRepository _mate { get; set; }
private readonly IMapper _mapper;
+ private static readonly SqlSugarScope Db = DataContext.Db;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="mate">鐗╂枡缂栫爜</param>
/// <param name="mapper">automapper</param>
- public MaterialsServer(IMaterialsRepository mate, IMapper mapper)
+ public MaterialsServer(IMaterialsRepository mate, IMapper mapper) : base(Db)
{
_mate = mate; //鐗╂枡缂栫爜
_mapper = mapper; //automapper
@@ -102,10 +105,11 @@
/// <param name="isControlled">鏄惁鍙楁帶</param>
/// <param name="isInspect">鏄惁鍏嶆</param>
/// <param name="environment">瀛樺偍鐜</param>
+ /// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
- public List<MaterialsDto> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment)
+ public List<MaterialsDto> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
- List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment);
+ List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
return matedto;
}
@@ -144,33 +148,21 @@
{
//鏄犲皠妯″瀷
SysMaterials mate = _mapper.Map<SysMaterials>(matedto);
- //鍒ゆ柇鐗╂枡鍙锋槸鍚﹀敮涓�
- int count = GetMateByNo(mate.SkuNo);
- int i = 0;
- if (matedto.AdventTime > 365 && matedto.AdventTime < 30)
- {
- return 2;
- }
- //else if (matedto.LowInventory > 1000)
- //{
- // return 4;
- //}
- else
- {
- if (count > 0)
- {
- i = 3;
- }
- else if (count == 0)
- {
- //鏂板
- i = await _mate.AddMate(mate);
- }
- return i;
- }
+ mate.AuditStatusNo = "9"; //瀹℃牳鐘舵��
+ mate.Type = mate.Type; //绫诲瀷
+ mate.IsControlled = string.IsNullOrWhiteSpace(mate.IsControlled) ? "0" : mate.IsControlled; //鏄惁鍙楁帶
+ mate.IsInspect = string.IsNullOrWhiteSpace(mate.IsInspect) ? "0" : mate.IsInspect; //鏄惁鍏嶆
+ mate.Origin = "WMS"; //鏉ユ簮
+ mate.IsDel = "0";
+ mate.CreateTime = Db.GetDate();
+ Db.BeginTran();
+ Db.Insertable(mate).ExecuteCommand();
+ Db.CommitTran();
+ return 1;
}
catch (Exception ex)
{
+ Db.RollbackTran();
//鎶涘嚭寮傚父
throw new Exception("鏂板鐗╂枡寮傚父", ex);
}
@@ -222,7 +214,15 @@
//鏄犲皠妯″瀷
SysMaterials mate = _mapper.Map<SysMaterials>(matedto);
//缂栬緫
- int i = await _mate.ExitMate(mate);
+ //鏍规嵁id鑾峰彇鐗╂枡淇℃伅
+ var list = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.Id == mate.Id);
+ //mate.CategoryNo = list.CategoryNo;
+ mate.Origin = list.Origin;
+ mate.CreateUser = list.CreateUser;
+ mate.UpdateTime = Db.GetDate();
+ mate.CreateTime = list.CreateTime;
+
+ int i = Db.Updateable(mate).ExecuteCommand();
return i;
}
}
--
Gitblit v1.8.0