From 2a9bf520f65e85777fff0f20f4c84ba9a810eef5 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 29 八月 2024 13:54:46 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
index 92fb59a..643771e 100644
--- a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
@@ -27,12 +27,13 @@
/// 缂栬緫鍌ㄤ綅淇℃伅
/// </summary>
/// <param name="id"></param>
+ /// <param name="areaNo">鎵�灞炲尯鍩�</param>
/// <param name="status">鐘舵��</param>
/// <param name="flag">鏍囪瘑</param>
/// <param name="temperature">瀛樺偍鐜</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public bool EditStorageLocat(int id, string status, string flag, string temperature,string url, int userId)
+ public bool EditStorageLocat(int id, string areaNo,string status, string flag, string temperature,string url, int userId)
{
try
{
@@ -54,6 +55,7 @@
locate2.Flag = "1";
locate2.UpdateUser = userId;
locate2.UpdateTime = DateTime.Now;
+ locate2.AreaNo = areaNo;
var m = Edit(locate2);
WcsLocat locatEntry = new WcsLocat();
@@ -79,6 +81,7 @@
locate.Status = status;
locate.Flag = flag;
locate.Temperature = temperature;
+ locate.AreaNo = areaNo;
locate.UpdateUser = userId;
locate.UpdateTime = DateTime.Now;
var i = Edit(locate);
@@ -125,11 +128,12 @@
/// 缂栬緫鍌ㄤ綅淇℃伅
/// </summary>
/// <param name="id"></param>
+ /// <param name="areaNo">鎵�灞炲尯鍩�</param>
/// <param name="status">鐘舵��</param>
/// <param name="flag">鏍囪瘑</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public bool EditStorageLocatList(List<int> id, string status, string flag,string temperature,string url ,int userId)
+ public bool EditStorageLocatList(List<int> id,string areaNo, string status, string flag,string temperature,string url ,int userId)
{
try
{
@@ -154,6 +158,7 @@
locate2.Flag = "1";
locate2.UpdateUser = userId;
locate2.UpdateTime = DateTime.Now;
+ locate2.AreaNo = areaNo;
var m = Edit(locate2);
WcsLocat locatEntry = new WcsLocat();
@@ -183,6 +188,7 @@
}
locate.UpdateUser = userId;
locate.UpdateTime = DateTime.Now;
+ locate.AreaNo = areaNo;
i = Edit(locate);
WcsLocat locatEntry2 = new WcsLocat();
--
Gitblit v1.8.0