From 5c40d83463c3db4455985f0302b10b79c63af23a Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 09:14:22 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/SystemSettings/UserManage.html | 78 +++++++++++++
HTML/views/BaseSetting/Materials.html | 77 ++++++++++--
HTML/views/QualityControl/QualityChangeLog.html | 2
HTML/views/SystemSettings/Role.html | 52 ++++++++
HTML/views/QualityControl/QualityInformation.html | 5
HTML/views/SystemSettings/Dictionary.html | 43 ++++++
HTML/views/HouseWithinSetting/FreezeUnfreeze.html | 36 +++++
HTML/views/SystemSettings/Category.html | 43 ++++++
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 2
9 files changed, 311 insertions(+), 27 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index a28aba1..60597c2 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -264,35 +264,79 @@
}, function() {});
}
});
- }
- sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
- $(function() {
- $("#approvalBtn").hide();
+ sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
+ $(function () {
+ $(".approvalBtn").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ $(function () {
+ $(".approvalBtnupt").hide();
+ });
+ if (res.code == 0) //鎴愬姛
+ {
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
+ $(function () {
+ $(".approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
+ $(function () {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(
+ "鑾峰彇淇℃伅澶辫触",
+ {
+ icon: 2,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },
+ function () {
+ //鍥炶皟
+ }
+ );
+ }
});
- $(function() {
+ }
+
+
+
+ sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
+ $(function () {
+ $(".approvalBtn").hide();
+ });
+ $(function () {
$(".approvalBtndel").hide();
});
- $(function() {
+ $(function () {
$(".approvalBtnupt").hide();
});
if (res.code == 0) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞鐗╂枡")
- {
- $(function() {
- $("#approvalBtn").show();
+ if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
+ $(function () {
+ $(".approvalBtn").show();
});
}
- if (res.data[k].MenuName == "鍒犻櫎鐗╂枡")
- {
- $(function() {
+ if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
+ $(function () {
$(".approvalBtndel").show();
});
}
- if (res.data[k].MenuName == "缂栬緫鐗╂枡")
- {
- $(function() {
+ if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
+ $(function () {
$(".approvalBtnupt").show();
});
}
@@ -313,6 +357,7 @@
}
});
+
var infoOptions = {
elem: "#LAY-app-content-list",
height: h1,
diff --git a/HTML/views/HouseWithinSetting/FreezeUnfreeze.html b/HTML/views/HouseWithinSetting/FreezeUnfreeze.html
index b1c4b14..aea0ab3 100644
--- a/HTML/views/HouseWithinSetting/FreezeUnfreeze.html
+++ b/HTML/views/HouseWithinSetting/FreezeUnfreeze.html
@@ -114,8 +114,8 @@
<li class="layui-this">鍐荤粨璁板綍</li>
<li>瑙ｅ喕璁板綍</li>
<div style="float: right;">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-dong">鍐荤粨</button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-jie">瑙ｅ喕</button>
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list Frozen" lay-submit lay-filter="LAY-app-contlist-dong">鍐荤粨</button>
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list Unfrozen" lay-submit lay-filter="LAY-app-contlist-jie">瑙ｅ喕</button>
</div>
</ul>
@@ -297,7 +297,8 @@
limits: pageLimits,
even: true,
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(){
+ done: function(){
+ setRight();
//鑷畾涔夊垪瀹�
SetTableColW('LAY-app-content-list','BllCheck/GetDataFreezeList',TotalColsSysArr);
},
@@ -384,6 +385,7 @@
even: true,
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function(){
+ setRight();
//鑷畾涔夊垪瀹�
SetTableColW('LAY-app-content-list2','BllCheck/GetDataUnFreezeList',DetailColsSysArr);
},
@@ -421,6 +423,34 @@
});
//#endregion
}
+ // 鏉冮檺璁剧疆
+ function setRight() {
+ $(function () {
+ $(".Frozen").hide();
+ $(".Unfrozen").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "鍐荤粨") {
+ $(function () {
+ $(".Frozen").show();
+ });
+ }
+ if (res.data[k].MenuName == "瑙ｅ喕") {
+ $(function () {
+ $(".Unfrozen").show();
+ });
+ }
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
//var url = IP + "/Statistical/GetInventoryList1";
diff --git a/HTML/views/QualityControl/QualityChangeLog.html b/HTML/views/QualityControl/QualityChangeLog.html
index c48fff2..0a0e60c 100644
--- a/HTML/views/QualityControl/QualityChangeLog.html
+++ b/HTML/views/QualityControl/QualityChangeLog.html
@@ -165,7 +165,7 @@
LotNo: LotNo,
SkuNo: SkuNo,
SkuName: SkuName,
- Origin:'Time'
+ Origin:'WMS'
};
// console.log(param)
var url = "/BllQuality/GetBllQualityList";
diff --git a/HTML/views/QualityControl/QualityInformation.html b/HTML/views/QualityControl/QualityInformation.html
index 6536610..c8760be 100644
--- a/HTML/views/QualityControl/QualityInformation.html
+++ b/HTML/views/QualityControl/QualityInformation.html
@@ -290,8 +290,9 @@
// 鏉冮檺璁剧疆
function setRight() {
+
$(function() {
- $("#approvalBtn").hide();
+ $(".approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -299,7 +300,7 @@
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
{
$(function() {
- $("#approvalBtn").show();
+ $(".approvalBtn").show();
});
}
}
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index 5aefbcb..4613a2b 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -125,10 +125,49 @@
}, function() {});
}
});
+ sendData(IP + "/basis/GetRoleRightList", {}, 'get', function (res) {
+ $(function () {
+ $(".approvalBtn").hide();
+ });
+ $(function () {
+ $(".approvalBtnupt").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "鏂板绫诲埆") {
+ $(function () {
+ $(".approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎绫诲埆") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫绫诲埆") {
+ console.log(1)
+ $(function () {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ });
+ }
+ });
}
sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
$(function() {
- $("#approvalBtn").hide();
+ $(".approvalBtn").hide();
});
$(function() {
$(".approvalBtnupt").hide();
@@ -140,7 +179,7 @@
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鏂板绫诲埆") {
$(function() {
- $("#approvalBtn").show();
+ $(".approvalBtn").show();
});
}
if (res.data[k].MenuName == "鍒犻櫎绫诲埆") {
diff --git a/HTML/views/SystemSettings/Dictionary.html b/HTML/views/SystemSettings/Dictionary.html
index af6d469..d421a3c 100644
--- a/HTML/views/SystemSettings/Dictionary.html
+++ b/HTML/views/SystemSettings/Dictionary.html
@@ -206,10 +206,49 @@
}, function() {});
}
});
+
+ sendData(IP + "/basis/GetRoleRightList", {}, 'get', function (res) {
+ $(function () {
+ $(".approvalBtn").hide();
+ });
+ $(function () {
+ $(".approvalBtnupt").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞瀛楀吀") {
+ $(function () {
+ $(".approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎瀛楀吀") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫瀛楀吀") {
+ $(function () {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ });
+ }
+ });
}
sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
$(function() {
- $("#approvalBtn").hide();
+ $(".approvalBtn").hide();
});
$(function() {
$(".approvalBtnupt").hide();
@@ -221,7 +260,7 @@
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞瀛楀吀") {
$(function() {
- $("#approvalBtn").show();
+ $(".approvalBtn").show();
});
}
if (res.data[k].MenuName == "鍒犻櫎瀛楀吀") {
diff --git a/HTML/views/SystemSettings/Role.html b/HTML/views/SystemSettings/Role.html
index 7c65efe..b3826ec 100644
--- a/HTML/views/SystemSettings/Role.html
+++ b/HTML/views/SystemSettings/Role.html
@@ -122,6 +122,58 @@
);
}
});
+ sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
+ $(function () {
+ $("#approvalBtn").hide();
+ });
+ $(function () {
+ $(".editClass").hide();
+ });
+ $(function () {
+ $(".roleClass").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ if (res.code == 0) {
+ //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "缂栬緫瑙掕壊") {
+ $(function () {
+ $(".editClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒嗛厤鏉冮檺") {
+ $(function () {
+ $(".roleClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "娣诲姞瑙掕壊") {
+ $(function () {
+ $("#approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎瑙掕壊") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ }
+ }
+ else {
+ //涓嶆垚鍔�
+ layer.msg(
+ "鑾峰彇淇℃伅澶辫触",
+ {
+ icon: 2,
+ time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },
+ function () {
+ //鍥炶皟
+ }
+ );
+ }
+ });
}
sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
$(function() {
diff --git a/HTML/views/SystemSettings/UserManage.html b/HTML/views/SystemSettings/UserManage.html
index 7264537..a1383c8 100644
--- a/HTML/views/SystemSettings/UserManage.html
+++ b/HTML/views/SystemSettings/UserManage.html
@@ -165,7 +165,83 @@
}, function() {});
}
});
+ var xml = '';
+ function getchiled(data, mainId) {
+ if (data) {
+ var list = data.filter(item => item.ParentId == mainId);
+ if (list) {
+ for (var i = 0; i < list.length; i++) {
+ var id = list[i].Id;
+ //鏌ヨ鏈夋棤瀛愯彍鍗�
+ var count = data.filter(item => item.ParentId == id).length;
+ if (count > 0) {
+ xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
+ getchiled(data, id);
+ xml = xml + '</dl></dd>';
+ }
+ else {
+ xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
+ }
+ }
+ }
+ }
+ }
+ sendData(IP + "/basis/GetRoleRightList", {}, 'get', function (res) {
+ $(function () {
+ $("#approvalBtn").hide();
+ });
+ $(function () {
+ $(".approvalBtndel").hide();
+ });
+ $(function () {
+ $(".approvalBtnupt").hide();
+ });
+ if (res.code == 0) //鎴愬姛
+ {
+ var list = res.data.filter(item => item.Layer == 0);
+ if (list) {
+ for (var i = 0; i < list.length; i++) {
+ xml = xml + '<li class="layui-nav-item">' + '<a href="javascript:;" lay-tips=' + list[i].Icon + ' lay-direction="2">' + '<span class="iconfont ' + list[i].Icon + '"></span>' + '<cite>' + list[i].MenuName + '</cite>' + '</a>';
+ var id = list[i].Id;
+ //鏌ヨ鏈夋棤瀛愯彍鍗�
+ var count = res.data.filter(item => item.ParentId == id).length;
+ if (count > 0) {
+ xml = xml + '<dl class="layui-nav-child">';
+ getchiled(res.data, id);
+ xml = xml + '</dl>';
+ }
+ xml = xml + '</li>'
+ }
+ }
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞鐢ㄦ埛") {
+ $(function () {
+ $("#approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鐢ㄦ埛") {
+ $(function () {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫鐢ㄦ埛") {
+ $(function () {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg('鑾峰彇淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ });
+ }
+ })
}
var xml = '';
function getchiled(data, mainId) {
@@ -193,6 +269,7 @@
}
}
}
+
sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
$(function() {
$("#approvalBtn").hide();
@@ -251,6 +328,7 @@
});
}
})
+
var infoOptions = {
elem: '#LAY-app-content-list',
height: h1,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 3b1572c..27ac2ea 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -3530,7 +3530,7 @@
//缁戝畾绠辨�绘暟閲�
//model.SkuQty = boxInfoList.Sum(s => s.Qty);
//鍜岄�夋嫨鐨勬壒娆″悓鎵规鐨勭鐮佷俊鎭�
- var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo).ToList();
+ var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo && w.Status == "0").ToList();
//鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆＄殑绠辩爜淇℃伅锛堟嫾绠辨壒娆★級
var notBoxInfoList = boxInfoList.Where(w => w.LotNo != model.LotNo).ToList();
#endregion
--
Gitblit v1.8.0