From a34a111ad3a31c227b9b03ecafbcb3fd1ae3d26a Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 18 六月 2024 09:14:50 +0800
Subject: [PATCH] Merge branch 'master' into zwc
---
Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs | 4
HTML/views/SOSetting/ExportNotice.html | 85 +++++++++++----------------
HTML/views/WareHouseSetting/Area.html | 2
HTML/views/WareHouseSetting/Locate.html | 56 ++++++++++--------
4 files changed, 68 insertions(+), 79 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b01f45e..f04eecd 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -57,41 +57,20 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- 23 -->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="6">浠ｅ偍鍑哄簱</option>
<option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
- <option value="1">闈炴爣閿�鍞嚭搴�</option>
- <option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">鎵ц鐘舵��</label>
<div class="layui-input-inline">
@@ -114,14 +93,14 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">鎵胯繍鍟�</label>
<div class="layui-input-inline">
<select name="LogisticsId" id="LogisticsId" lay-search>
<option value=""></option>
</select>
</div>
- </div>
+ </div> -->
<!-- <div class="layui-inline">
<label class="layui-form-label">鏄惁娉㈡</label>
<div class="layui-input-inline">
@@ -132,7 +111,7 @@
</select>
</div>
</div> -->
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">鏄惁鍙戣繍</label>
<div class="layui-input-inline">
<select name="IsDespatch" id="IsDespatch" lay-search>
@@ -141,7 +120,7 @@
<option value="1">鏄�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
@@ -469,7 +448,7 @@
var isChongFu = true;
var xqid = "kong";
refreshTable();
- // refreshTablemx(xqid);
+ //refreshTablemx(xqid);
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -495,14 +474,14 @@
{ field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 165, "disabled": true },
{ field: 'Type', title: '鍗曟嵁绫诲瀷', align: 'center', templet: '#templetType' },
{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', templet: '#templetStatus' },
- { field: 'LogisticsName', title: '鎵胯繍鍟�', align: 'center' },
- { field: 'CustomerName', title: '瀹㈡埛鍚嶇О', align: 'center' },
+ // { field: 'LogisticsName', title: '鎵胯繍鍟�', align: 'center' },
+ // { field: 'CustomerName', title: '瀹㈡埛鍚嶇О', align: 'center' },
{ field: 'LotNo', title: '鎵规鍙�', align: 'center' },
{ field: 'LotNoText', title: '鎵规鎻忚堪', align: 'center' },
- { field: 'IsDespatch', title: '鏄惁鍙戣繍', align: 'center', templet: '#templetIsDespatch' },
- { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' },
+ //{ field: 'IsDespatch', title: '鏄惁鍙戣繍', align: 'center', templet: '#templetIsDespatch' },
+ //{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' },
{ field: 'Origin', title: '鏉ユ簮', align: 'center' },
- { field: 'Demo', title: '澶囨敞', align: 'center', width: 180 },
+ { field: 'Demo', title: '澶囨敞', align: 'center'},
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center' },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#templetCreateTime' },
{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center' },
@@ -777,21 +756,21 @@
var DetailColsArr = [[
{ field: '', title: '搴忓彿', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
{ field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 165 },
- { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 130 },
- { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 152 },
- { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 270 },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 150 },
- { field: 'Qty', title: '璁″垝鏁伴噺', align: 'center', width: 100 },
- { field: 'AllotQty', title: '鍒嗛厤鏁伴噺', align: 'center', width: 100 },
- { field: 'FactQty', title: '涓嬫灦鏁伴噺', align: 'center', width: 100 },
- { field: 'CompleteQty', title: '鎷ｈ揣鏁伴噺', align: 'center', width: 100 },
- { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
- { field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
- { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100 },
- { field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 120 },
- { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 120 },
- { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
- { field: 'Money', title: '鎬婚噾棰�', align: 'center', width: 90 },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
+ { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center'},
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center'},
+ { field: 'Qty', title: '璁″垝鏁伴噺', align: 'center'},
+ //{ field: 'AllotQty', title: '鍒嗛厤鏁伴噺', align: 'center', width: 100 },
+ //{ field: 'FactQty', title: '涓嬫灦鏁伴噺', align: 'center', width: 100 },
+ //{ field: 'CompleteQty', title: '鎷ｈ揣鏁伴噺', align: 'center', width: 100 },
+ //{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
+ //{ field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
+ //{ field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 120 },
+ //{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 120 },
+ //{ field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
+ //{ field: 'Money', title: '鎬婚噾棰�', align: 'center', width: 90 },
{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -998,17 +977,23 @@
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
toolbar: '#toolbarDemo',
- defaultToolbar: ['print'], //'print', 'exports'
+ defaultToolbar: [''], //'print', 'exports'
page: true,
limit: pageCnt,
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+
done: function () {
initMenu();
//鑷畾涔夊垪瀹�
SetTableColW('LAY-app-content-list2', 'BllSo/GetExportNoticeDetailList', DetailColsSysArr);
},
- cols: colsJson2
+ cols: colsJson2,
+ layout: {
+ row: {
+ entiren: true // 璁剧疆琛ㄦ牸瀹藉害閾烘弧
+ }
+ }
});
});
//#endregion
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