From 0bd99d2747b1ce99f250a25776da0112ec5c32db Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 17 六月 2024 14:56:16 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs | 4 +-
HTML/views/WareHouseSetting/Area.html | 2
HTML/views/WareHouseSetting/Locate.html | 56 +++++++++++++++-------------
3 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 385bc4e..556d41a 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -327,7 +327,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function() {
layer.close(index); //鍏抽棴寮瑰眰
- // refreshTable($("#CategoryName").val(),$("#AreaNo").val());
+ refreshTable($("#CategoryName").val(),$("#AreaNo").val());
doing = true;
});
}
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 9f52be6..c4fd05a 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -323,22 +323,24 @@
field: 'WareHouseName',
title: '鎵�灞炰粨搴�',
align: 'center',
- width: 140,
+ width: 180,
fixed: 'left',
templet: function(d) {
return d.WareHouseNo + '-' + d.WareHouseName;
}
- }, {
- field: 'RoadwayNo',
- title: '鎵�灞炲贩閬�',
- align: 'center',
- width: 130,
- templet: function(d) {
+ },
+ // {
+ // field: 'RoadwayNo',
+ // title: '鎵�灞炲贩閬�',
+ // align: 'center',
+ // width: 130,
+ // templet: function(d) {
- return d.RoadwayNo + '-' + d.RoadwayName;
- }
- }, {
+ // return d.RoadwayNo + '-' + d.RoadwayName;
+ // }
+ // },
+ {
field: 'AreaName',
title: '鎵�灞炲尯鍩�',
align: 'center',
@@ -381,22 +383,24 @@
title: '娣卞害',
align: 'center',
width: 70,
- }, {
- field: 'Height',
- title: '楂樺害',
- align: 'center',
- width: 90,
- }, {
- field: 'Weight',
- title: '閲嶉噺',
- align: 'center',
- width: 90,
- }, {
- field: 'TempName',
- title: '瀛樺偍鍧忓',
- align: 'center',
- width: 110,
- }, {
+ },
+ // {
+ // field: 'Height',
+ // title: '楂樺害',
+ // align: 'center',
+ // width: 90,
+ // }, {
+ // field: 'Weight',
+ // title: '閲嶉噺',
+ // align: 'center',
+ // width: 90,
+ // }, {
+ // field: 'TempName',
+ // title: '瀛樺偍鍧忓',
+ // align: 'center',
+ // width: 110,
+ // },
+ {
title: '鎿嶄綔',
fixed: 'right',
width: 120,
diff --git a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
index 509133c..d1834c7 100644
--- a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
@@ -93,7 +93,7 @@
outDtoList.Add(locatEntry2);
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var jsonData = JsonConvert.SerializeObject(outDtoList);
+ /*var jsonData = JsonConvert.SerializeObject(outDtoList);
string response = "";
try
@@ -109,7 +109,7 @@
catch (Exception ex)
{
throw new Exception(ex.Message);
- }
+ }*/
}
Db.CommitTran();
--
Gitblit v1.8.0