From 0c9d469fa247665eaa37908b811ae5f183da7a3e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 27 二月 2024 16:02:00 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/js/public.js | 17 ++
HTML/views/BaseSetting/Department.html | 9
Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs | 2
HTML/views/ASNSetting/PalletBind.html | 14 +
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 11 +
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 6
HTML/views/BaseSetting/Packag.html | 9
HTML/views/SystemSettings/Dictionary.html | 11
HTML/views/ASNSetting/ArrivalNotice.html | 2
HTML/views/SystemSettings/Category.html | 10
Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs | 8
Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs | 4
HTML/views/SystemSettings/Menumanagement.html | 10
HTML/views/BaseSetting/Unit.html | 11
Wms/WMS.BLL/Logic/AllotSku.cs | 18 +-
HTML/views/SystemSettings/FunSetting.html | 11
HTML/views/BaseSetting/LogOperation.html | 12 +
HTML/views/StatisticalReport/BoxInfor.html | 25 +-
HTML/views/SystemSettings/LogOperation.html | 11
HTML/views/StatisticalReport/AdventSlot.html | 12 +
Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs | 8
HTML/views/SystemSettings/UserManage.html | 10
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 8
HTML/views/BaseSetting/Materials.html | 10
HTML/views/StatisticalReport/InOutBoundReports.html | 14 +
HTML/views/SystemSettings/Role.html | 10
HTML/views/StatisticalReport/InventoryStatistics.html | 14 +
HTML/views/BaseSetting/LogisticsInfo.html | 10
Wms/Wms/Controllers/DownApiController.cs | 33 ++++
HTML/views/StatisticalReport/LowStockSlotList.html | 10
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 82 ++++++++--
31 files changed, 298 insertions(+), 124 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index 7b8cf0d..7e11b1b 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -179,6 +179,9 @@
var bodyHeight = $("#body").outerHeight();
var topHeight = $("#top").outerHeight();
var centerHeight = $("#center").outerHeight();
+// console.log(bodyHeight);
+// console.log(topHeight);
+// console.log(centerHeight);
var hh = bodyHeight - topHeight-centerHeight - 26 ;//6鏄痓ody涓婂唴杈硅窛
return hh;
@@ -207,6 +210,20 @@
var h2 = parseInt(hh*0.4)
return h2;
}
+//鑾峰彇闄ゆ悳绱㈡潯浠朵互鍙婇〉绛惧楂樺害
+function GetTableTabHeight() {
+ var bodyHeight = $("#body").outerHeight();
+ var topHeight = $("#top").outerHeight();
+ var centerHeight = $("#center").outerHeight();
+ var tabHeight = $("#tab").outerHeight();
+ // console.log(bodyHeight);
+ // console.log(topHeight);
+ // console.log(centerHeight);
+ // console.log(tabHeight);
+
+ var hh = bodyHeight - topHeight-centerHeight-tabHeight - 57 ;//6鏄痓ody涓婂唴杈硅窛
+ return hh;
+}
//鍒ゆ柇鏄惁姝ｆ暣鏁� true 姝ｆ暣鏁� false 鍏朵粬
function isIntNum(val){
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 3c07fab..dd840b9 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -401,7 +401,7 @@
elem: '#EndTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
-
+
var h1 = GetTableTopHeight();
var h2 = GetTableBottomHeight();
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 1fa9dcd..ea693af 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -34,11 +34,11 @@
</script>
</head>
-<body>
+<body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍏ュ簱鍗曞彿</label>
@@ -146,10 +146,13 @@
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏淇℃伅</li>
<li >绠辩爜淇℃伅</li>
</ul>
+
+ <div id="center"></div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -374,6 +377,7 @@
laypage = layui.laypage,
layer = layui.layer;
laydate = layui.laydate;
+ var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
@@ -684,7 +688,7 @@
table.render({
id: 'PalletBind',
elem: '#PalletBind',
- height: 'full-210',
+ height: h1,
url: IP + "/BllAsn/GetPalletBindList",
method: 'post',
contentType: 'application/json',
@@ -930,7 +934,7 @@
table.render({
id: 'BoxInfo',
elem: '#BoxInfo',
- height: 'full-210',
+ height: h1,
url: IP + "/BllAsn/GetBoxInfoList",
method: 'post',
contentType: 'application/json',
diff --git a/HTML/views/BaseSetting/Department.html b/HTML/views/BaseSetting/Department.html
index 36feaff..4c506bc 100644
--- a/HTML/views/BaseSetting/Department.html
+++ b/HTML/views/BaseSetting/Department.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 56px">閮ㄩ棬缂栫爜</label>
@@ -41,6 +41,8 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
<div class="layui-card-body">
<div style="padding-bottom: 5px;display: flex;flex-direction: row-reverse;">
@@ -81,6 +83,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("", "");
var tableIns;
@@ -170,7 +173,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-129",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
diff --git a/HTML/views/BaseSetting/LogOperation.html b/HTML/views/BaseSetting/LogOperation.html
index cd26c83..a0dc58b 100644
--- a/HTML/views/BaseSetting/LogOperation.html
+++ b/HTML/views/BaseSetting/LogOperation.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>鐢ㄦ埛淇℃伅鍒楄〃</title>
+ <title>鎿嶄綔鏃ュ織</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item" >
<div class="layui-inline">
<label class="layui-form-label">鑿滃崟鍙�</label>
@@ -55,6 +55,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
</div>
@@ -75,6 +78,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("", "", "", "","");
var tableIns;
@@ -162,7 +166,7 @@
}
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-94',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
diff --git a/HTML/views/BaseSetting/LogisticsInfo.html b/HTML/views/BaseSetting/LogisticsInfo.html
index f36aa8b..2ab13d6 100644
--- a/HTML/views/BaseSetting/LogisticsInfo.html
+++ b/HTML/views/BaseSetting/LogisticsInfo.html
@@ -17,10 +17,10 @@
</script>
</head>
-<body>
+<body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px; padding-left: 0px;">杩愯緭鍏徃</label>
@@ -79,6 +79,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -113,6 +116,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
var xqid = "";
refreshTable("","","","","");
var tableIns;
@@ -130,7 +134,7 @@
elem: '#LAY-app-content-list',
url: IP + "/Basis/GetLogisticsInfoList",
method: 'POST',
- height: 'full-95',
+ height: h1,
id: 'LAY-app-content-list',
where: param,
contentType: 'application/json',
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 7732a42..69347f6 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<!-- 鐗╂枡缂栫爜 -->
<div class="layui-inline">
@@ -120,6 +120,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -203,6 +206,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("","","","","","","","");
var tableIns;
//鑾峰彇绫诲埆淇℃伅
@@ -303,7 +307,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-140",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
diff --git a/HTML/views/BaseSetting/Packag.html b/HTML/views/BaseSetting/Packag.html
index 14b160a..78d842e 100644
--- a/HTML/views/BaseSetting/Packag.html
+++ b/HTML/views/BaseSetting/Packag.html
@@ -26,11 +26,11 @@
</script>
</head>
-<body>
+<body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
<!-- 鏌ヨ鏉′欢 -->
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍖呰缂栫爜</label>
@@ -67,6 +67,8 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
<div class="layui-card-body">
<!-- 鎸夐挳 -->
@@ -119,6 +121,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
var param = {
Id: $.cookie('userId')
}
@@ -130,7 +133,7 @@
};
var tableIns = table.render({
elem: '#LAY-app-content-list',
- height: 'full-95',
+ height: h1,
id: 'LAY-app-content-list',
url: url,
method: 'post',
diff --git a/HTML/views/BaseSetting/Unit.html b/HTML/views/BaseSetting/Unit.html
index 6358503..20596e0 100644
--- a/HTML/views/BaseSetting/Unit.html
+++ b/HTML/views/BaseSetting/Unit.html
@@ -20,11 +20,11 @@
</script>
</head>
-<body>
+<body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍗曚綅缂栫爜</label>
@@ -54,6 +54,8 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -85,7 +87,8 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+
+ var h1 = GetTableHeight();
var param = {
Id: $.cookie('userId')
@@ -101,7 +104,7 @@
var tableIns = table.render({
elem: '#LAY-app-content-list',
- height: 'full-95',
+ height: h1,
id: 'LAY-app-content-list',
url: url,
method: 'post',
diff --git a/HTML/views/StatisticalReport/AdventSlot.html b/HTML/views/StatisticalReport/AdventSlot.html
index 3cd8676..7acc34f 100644
--- a/HTML/views/StatisticalReport/AdventSlot.html
+++ b/HTML/views/StatisticalReport/AdventSlot.html
@@ -19,10 +19,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0; ">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item">
<div class="layui-inline zongdan" >
@@ -95,6 +95,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -173,6 +176,9 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
+
+ var h1 = GetTableHeight();
+
refreshTable("","","","","","","","","");
var tableIns;
@@ -297,7 +303,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-136',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 5fe5cfc..b5bb0b4 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -27,11 +27,10 @@
</script>
</head>
- <body>
-
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
<div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
@@ -148,19 +147,20 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
</button>
</div>
-
-
</div>
</div>
-
-
+
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏鏄庣粏</li>
<li >绠辩爜鏄庣粏</li>
</ul>
+
+ <div id="center">
+ </div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -280,7 +280,10 @@
element = layui.element;
laydate = layui.laydate;
-
+ var h1 = GetTableTabHeight();
+ // var h1 = GetTkableTopHeight();
+ // console.log(h1)
+
laydate.render({
elem: '#StartTime',
format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
@@ -424,7 +427,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
@@ -587,7 +590,7 @@
}
infoOptions2 = {
elem: '#LAY-app-content-list2',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list2',
page: true,
limit: pageCnt,
diff --git a/HTML/views/StatisticalReport/InOutBoundReports.html b/HTML/views/StatisticalReport/InOutBoundReports.html
index 21d467d..c1450ef 100644
--- a/HTML/views/StatisticalReport/InOutBoundReports.html
+++ b/HTML/views/StatisticalReport/InOutBoundReports.html
@@ -27,11 +27,11 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
<div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
@@ -87,10 +87,13 @@
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎬婚噺</li>
<li >璁板綍</li>
</ul>
+
+ <div id="center"></div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -161,6 +164,7 @@
element = layui.element;
laydate = layui.laydate;
+ var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime',
@@ -295,7 +299,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-164',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
@@ -471,7 +475,7 @@
}
infoOptions2 = {
elem: '#LAY-app-content-list2',
- height: 'full-164',
+ height: h1,
id: 'LAY-app-content-list2',
page: true,
limit: pageCnt,
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 32821f8..d48b2e1 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -29,11 +29,11 @@
</head>
-<body>
+<body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
<div class="layui-inline zongdan">
@@ -155,10 +155,13 @@
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">搴撳瓨鎬婚噺</li>
<li>搴撳瓨鏄庣粏</li>
</ul>
+
+ <div id="center"></div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -255,6 +258,7 @@
element = layui.element;
laydate = layui.laydate;
+ var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime',
@@ -382,7 +386,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list',
totalRow: true,
page: true,
@@ -549,7 +553,7 @@
}
infoOptions2 = {
elem: '#LAY-app-content-list2',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list2',
page: true,
limit: pageCnt,
diff --git a/HTML/views/StatisticalReport/LowStockSlotList.html b/HTML/views/StatisticalReport/LowStockSlotList.html
index 384d56b..c1ace3f 100644
--- a/HTML/views/StatisticalReport/LowStockSlotList.html
+++ b/HTML/views/StatisticalReport/LowStockSlotList.html
@@ -19,10 +19,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0; ">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item">
<div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
@@ -62,6 +62,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -107,6 +110,7 @@
layer = layui.layer;
var $ = layui.$;
+ var h1 = GetTableHeight();
refreshTable("","","","");
var tableIns;
@@ -193,7 +197,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-94',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index 25f834e..5aefbcb 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">绫诲埆鍚嶇О</label>
@@ -48,6 +48,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -78,6 +81,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
var tableIns;
//鑾峰彇鍖哄煙淇℃伅
@@ -165,7 +169,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-95",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/Dictionary.html b/HTML/views/SystemSettings/Dictionary.html
index 1b4c80d..af6d469 100644
--- a/HTML/views/SystemSettings/Dictionary.html
+++ b/HTML/views/SystemSettings/Dictionary.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">瀛楀吀鍚嶇О</label>
@@ -88,6 +88,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
<!-- 鏄惁鍏紑 -->
@@ -154,7 +157,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+ var h1 = GetTableHeight();
var tableIns;
//鑾峰彇鐖剁骇瀛楀吀鍙�
@@ -246,7 +249,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-95",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/FunSetting.html b/HTML/views/SystemSettings/FunSetting.html
index a263e95..c264676 100644
--- a/HTML/views/SystemSettings/FunSetting.html
+++ b/HTML/views/SystemSettings/FunSetting.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍔熻兘鍚嶇О</label>
@@ -56,6 +56,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
<script type="text/html" id="buttonIsEnable">
@@ -91,7 +94,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+ var h1 = GetTableHeight();
var tableIns;
function refreshTable(FunSetName, IsEnable,GroupNo) {
@@ -164,7 +167,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-95",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/LogOperation.html b/HTML/views/SystemSettings/LogOperation.html
index 4275b8a..ba320c4 100644
--- a/HTML/views/SystemSettings/LogOperation.html
+++ b/HTML/views/SystemSettings/LogOperation.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0; ">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item" >
<div class="layui-inline">
<label class="layui-form-label">鑿滃崟鍙�</label>
@@ -55,6 +55,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
</div>
@@ -74,7 +77,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+ var h1 = GetTableHeight();
refreshTable("", "", "", "","");
var tableIns;
@@ -162,7 +165,7 @@
}
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-94',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/Menumanagement.html b/HTML/views/SystemSettings/Menumanagement.html
index 36235ad..9a082c3 100644
--- a/HTML/views/SystemSettings/Menumanagement.html
+++ b/HTML/views/SystemSettings/Menumanagement.html
@@ -17,9 +17,9 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-card" style="margin-bottom: 0px;">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item" >
<div class="layui-inline">
<label class="layui-form-label">鑿滃崟鍚嶇О</label>
@@ -66,6 +66,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<!-- <div style="padding-bottom: 5px;display: flex; flex-direction: row-reverse;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-hide layui-btn-danger" data-type="hide">
@@ -119,6 +122,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("","","","","");
var tableIns;
@@ -288,7 +292,7 @@
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-88',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/Role.html b/HTML/views/SystemSettings/Role.html
index 93cf698..ff3dd2b 100644
--- a/HTML/views/SystemSettings/Role.html
+++ b/HTML/views/SystemSettings/Role.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 56px">瑙掕壊缂栧彿</label>
@@ -46,6 +46,8 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
<div class="layui-card-body">
<!-- <div style="padding-bottom: 5px;display: flex;flex-direction: row-reverse;">
@@ -85,7 +87,7 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+ var h1 = GetTableHeight();
refreshTable("", "");
var tableIns;
@@ -183,7 +185,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-95",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
diff --git a/HTML/views/SystemSettings/UserManage.html b/HTML/views/SystemSettings/UserManage.html
index 45be757..823c4d4 100644
--- a/HTML/views/SystemSettings/UserManage.html
+++ b/HTML/views/SystemSettings/UserManage.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item" >
<div class="layui-inline">
<label class="layui-form-label">鐧诲綍鍚�</label>
@@ -59,6 +59,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<!-- <div style="padding-bottom: 5px;display: flex; flex-direction: row-reverse;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-hide layui-btn-danger" data-type="hide">
@@ -107,6 +110,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("", "", "", "");
var tableIns;
//鑾峰彇瑙掕壊淇℃伅
@@ -249,7 +253,7 @@
})
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-95',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
index f90e033..4ef74ba 100644
--- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
+++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
@@ -48,22 +48,22 @@
/// <summary>
/// Desc:鏁伴噺
/// </summary>
- public int Qty { get; set; }
+ public decimal Qty { get; set; }
/// <summary>
/// Desc:鍒嗛厤鏁伴噺
/// </summary>
- public int? AllotQty { get; set; }
+ public decimal? AllotQty { get; set; }
/// <summary>
/// Desc:涓嬫灦鏁伴噺
/// </summary>
- public int? FactQty { get; set; }
+ public decimal? FactQty { get; set; }
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
/// </summary>
- public int? CompleteQty { get; set; }
+ public decimal? CompleteQty { get; set; }
/// <summary>
/// Desc:鍖呰缂栫爜
diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
index 962ca86..d694a54 100644
--- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
+++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
@@ -128,7 +128,7 @@
public string SkuNo { get; set; } //鐗╂枡缂栫爜
public string SkuName { get; set; } //鐗╂枡鍚嶇О
public decimal Qty { get; set; } //搴撳瓨鏁伴噺
- public int ExQty { get; set; } //鏁伴噺
+ public decimal ExQty { get; set; } //鏁伴噺
public string Standard { get; set; }
public string IsBale { get; set; } //鏄惁瑁瑰寘
public string IsBelt { get; set; } //鏄惁鎵撳甫
@@ -214,7 +214,7 @@
/// <summary>
/// Desc:鏁伴噺
/// </summary>
- public int Qty { get; set; }
+ public decimal Qty { get; set; }
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
index 6b427a3..b82d1c7 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
+++ b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
@@ -7,10 +7,10 @@
public class OutPdaInfo
{
public string OutModel { get; set; } // 鎷ｈ揣鍖猴紙鍑哄簱鍙ｏ級
- public int PlanQty { get; set; } // 璁″垝鏁伴噺
- public int? FinishQty { get; set; } // 瀹屾垚鏁伴噺
+ public decimal PlanQty { get; set; } // 璁″垝鏁伴噺
+ public decimal? FinishQty { get; set; } // 瀹屾垚鏁伴噺
public string Standard { get; set; } // 瑙勬牸
- public int PickQty { get; set; } // 鎵樼洏寰呮嫞鏁伴噺
+ public decimal PickQty { get; set; } // 鎵樼洏寰呮嫞鏁伴噺
public decimal? PickedQty { get; set; } // 鎵樼洏宸叉嫞鏁伴噺
}
public class BoxInfo
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 52a047c..0a362ba 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -862,22 +862,48 @@
}
}
var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
- .GroupBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
+ .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
- SysRoadwayUseLog useLog = Db.Ado.SqlQuerySingle<SysRoadwayUseLog>("select Top(1) * from SysRoadwayUseLog where IsDel=0 order by CreateTime desc"); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
+ SysRoadwayUseLog useLog = Db.Queryable<SysRoadwayUseLog>().Where(m=>m.IsDel =="0" && roadList.Contains(m.RoadwayNo)).OrderByDescending(l => l.Id).First(); //宸烽亾鏈�鍚庝竴娆′娇鐢ㄨ褰�
- var bindNum = Db.Queryable<BllPalletBind>()
- .Where(m => m.IsDel == "0" && m.Status == "0" && !string.IsNullOrWhiteSpace(m.RoadwayNo))
- .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
+ #region 纭畾宸烽亾鎺掑簭
+
+ List<string> roadList2 = new List<string>();
+ List<string> roadSmall = new List<string>();
+ List<string> roadLarge = new List<string>();
+ if (useLog != null)
+ {
+ roadList2.Add(useLog.RoadwayNo);
+ foreach (var r in roadList)
+ {
+ if (r == useLog.RoadwayNo)
+ {
+ continue;
+ }
+ //濡傛灉缁撴灉涓�0锛屽垯璇存槑涓や釜瀛楃涓茬浉绛夛紱
+ //濡傛灉缁撴灉灏忎簬0锛屽垯璇存槑绗竴涓瓧绗︿覆灏忎簬绗簩涓瓧绗︿覆锛�
+ //濡傛灉缁撴灉澶т簬0锛屽垯璇存槑绗竴涓瓧绗︿覆澶т簬绗簩涓瓧绗︿覆銆�
+ var bol = String.CompareOrdinal(r, useLog.RoadwayNo);
+ if (bol < 0)
+ {
+ roadSmall.Add(r);
+ }
+ if (bol > 0)
+ {
+ roadLarge.Add(r);
+ }
+ }
+ roadList2.AddRange(roadLarge);
+ roadList2.AddRange(roadSmall);
+ }
+
+ roadList = roadList2;
+ #endregion
+
var roadNo = "";
if (laneAllot == 0)//璺冲贩閬撳钩鍧囧垎閰�
{
- //濡傛灉鍚岀骇宸烽亾鏈夊鏉″垯鏌ヤ笂娆′綅缃棩蹇�
- if (roadList.Count > 1)
- {
- useLog = Db.Queryable<SysRoadwayUseLog>().OrderByDescending(l => l.Id).First();
- }
//鍙栧悇宸烽亾鎵�鏈夋帓绗竴涓悎閫備綅
foreach (var l in roadList)
{
@@ -888,7 +914,11 @@
}
var locateCount = Db.Queryable<SysStorageLocat>()
- .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo)).Count();
+ .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l).Count();
+
+ var bindNum = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo== l)
+ .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
if (locateCount - bindNum > 0)
{
roadNo = l;
@@ -905,19 +935,39 @@
{
if (useLog != null)
{
- roadNo = useLog.RoadwayNo;
+ var locateCount = Db.Queryable<SysStorageLocat>()
+ .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == useLog.RoadwayNo).Count();
+
+ var bindNum = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo == useLog.RoadwayNo)
+ .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
+ if (locateCount - bindNum > 0)
+ {
+ roadNo = useLog.RoadwayNo;
+ }
}
}
}
else//鎸夌収宸烽亾浼樺厛绾у垎閰�
{
foreach (var item in roadList)
- {
- roadNo = item;
+ {
+ var locateCount = Db.Queryable<SysStorageLocat>()
+ .Where(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == item).Count();
+
+ var bindNum = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.Status == "0" && m.RoadwayNo == item)
+ .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
+
+ if (locateCount - bindNum > 0)
+ {
+ roadNo = item;
+ }
+ //褰撳墠宸锋湁浣嶇疆鍒欓��鍑�
if (roadNo != null)
{
break;
- }
+ }
}
}
@@ -975,7 +1025,7 @@
}
#endregion
- return null;
+ return comDto;
}
catch (Exception e)
{
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index bc3aad1..b350535 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2034,8 +2034,15 @@
if (detail.Status == "0")
{
var sqlString2 = string.Empty;
- sqlString2 += $"update BllArrivalNotice set Status = '1',CompleteTime= getDate() where ASNNo = '{model.AsnNo}' and Status ='0';";
- sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',CompleteTime= getDate() where id = '{model.AsnDetailId}' and Status ='0';";
+ sqlString2 += $"update BllArrivalNotice set Status = '1',UpdateTime= getDate(),UpdateUser = {userId} where ASNNo = '{model.AsnNo}' and Status ='0';";
+ sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',UpdateTime= getDate(),UpdateUser = {userId} where id = '{model.AsnDetailId}' and Status ='0';";
+ Db.Ado.ExecuteCommand(sqlString2);
+ }
+ else if (detail.Status == "1")
+ {
+ var sqlString2 = string.Empty;
+ sqlString2 += $"update BllArrivalNotice set UpdateTime= getDate(),UpdateUser = {userId} where ASNNo = '{model.AsnNo}' and Status ='1';";
+ sqlString2 += $"update BllArrivalNoticeDetail set UpdateTime= getDate(),UpdateUser = {userId} where id = '{model.AsnDetailId}' and Status ='1';";
Db.Ado.ExecuteCommand(sqlString2);
}
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 714766d..e863a79 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2256,11 +2256,11 @@
}
#endregion
//鍙栧悎閫傚簱瀛樺晢鍝�
- Dictionary<int, int> stockQtyDic = new Dictionary<int, int>();//鎵樺嚭搴撶墿鍝佹暟
+ Dictionary<int, decimal> stockQtyDic = new Dictionary<int, decimal>();//鎵樺嚭搴撶墿鍝佹暟
Dictionary<string, int> zxQtyDic = new Dictionary<string, int>();//鎵樺嚭鏁寸鏁�
//鍒嗛厤璐х墿
//assign.AllocatePallets(stocks, pNum, bNum, needQty, stockQtyDic, zxQtyDic);
- int qty = assign.AllotPallets(stockDetail, int.Parse(needQty.ToString()), pNum, bNum, stockQtyDic);
+ var qty = assign.AllotPallets(stockDetail, decimal.Parse(needQty.ToString()), pNum, bNum, stockQtyDic);
foreach (var sc in stockQtyDic)
{
@@ -2678,8 +2678,8 @@
//淇敼鍑哄簱鍗曠姸鎬�
if (notice.Status == "0" || notice.Status == "1")
{
- int totalQty = 0;
- int totalAllotQty = 0;
+ decimal totalQty = 0;
+ decimal totalAllotQty = 0;
foreach (var item in detailList)
{
totalQty += item.Qty;
diff --git a/Wms/WMS.BLL/Logic/AllotSku.cs b/Wms/WMS.BLL/Logic/AllotSku.cs
index d0af838..3b600fd 100644
--- a/Wms/WMS.BLL/Logic/AllotSku.cs
+++ b/Wms/WMS.BLL/Logic/AllotSku.cs
@@ -14,14 +14,12 @@
/// 鍒嗛厤璐х墿
/// </summary>
/// <param name="palletList">搴撳瓨鏄庣粏闆嗗悎</param>
- /// <param name="goodCode">鐗╂枡缂栫爜</param>
- /// <param name="lotNo">鎵规</param>
/// <param name="needQty">闇�瑕佸垎閰嶇殑鏁伴噺</param>
/// <param name="fullPalletQty">婊℃墭鏁伴噺</param>
/// <param name="fullBoxQty">婊＄鏁伴噺</param>
/// <param name="stockQtyDic">鎵樺嚭搴撶墿鍝佹暟 key:搴撳瓨鎵樼洏琛ㄧ殑ID銆乿al:鎵樼洏涓婄殑鏁伴噺</param>
/// <returns></returns>
- public int AllotPallets(List<DataStockDetail> palletList, int needQty, int fullPalletQty, int fullBoxQty, Dictionary<int, int> stockQtyDic)
+ public decimal AllotPallets(List<DataStockDetail> palletList, decimal needQty, int fullPalletQty, int fullBoxQty, Dictionary<int, decimal> stockQtyDic)
{
//浼樺厛鍏堣繘鍏堝嚭锛堝揩杩囨湡鐨勫厛鍑猴級
//浼樺厛闆剁銆侀浂鎵橈紙鍑哄畬闆剁鍑烘暣绠憋級
@@ -53,7 +51,7 @@
}
}
#endregion
- var qty = 0; //鍒嗛厤鐨勬�绘暟閲�
+ decimal qty = 0; //鍒嗛厤鐨勬�绘暟閲�
var ztNum = needQty / fullPalletQty;//闇�瑕佹暣鎵樻暟
var zps = palletList.Where(s => s.Qty >= fullPalletQty).ToList();//鏁存墭
@@ -66,7 +64,7 @@
//鏁ｆ墭
foreach (var s in st)
{
- var detailQty = int.Parse((s.Qty - s.LockQty - s.FrozenQty).ToString());
+ var detailQty = decimal.Parse((s.Qty - s.LockQty - s.FrozenQty).ToString());
if (needQty - qty < detailQty)
{
var num = needQty - qty;
@@ -89,7 +87,7 @@
var zt = zps.OrderBy(s => s.ExpirationTime).ToList();//鎵�鏈夋湭浣跨敤鐨勬墭鐩橈紙鏈鍒嗛厤鐨勶級
foreach (var ss in zt)
{
- var detailQty = int.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
+ var detailQty = decimal.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
if (needQty - qty < detailQty)
{
var num = needQty - qty;
@@ -123,7 +121,7 @@
var zt = zps.OrderBy(s => s.ExpirationTime).ToList();//鎵�鏈夋湭浣跨敤鐨勬墭鐩橈紙鏈鍒嗛厤鐨勶級
foreach (var ss in zt)
{
- var detailQty = int.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
+ var detailQty = decimal.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
if (needQty - qty < detailQty)
{
break;
@@ -144,7 +142,7 @@
foreach (var ss in zt)
{
- var detailQty = int.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
+ var detailQty = decimal.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
if (needQty - qty < detailQty)
{
var num = needQty - qty;
@@ -167,7 +165,7 @@
var zt = zps.Where(s => !sIds.Contains(s.Id)).OrderBy(s => s.ExpirationTime).ThenBy(m => m.Qty - m.LockQty - m.FrozenQty).ToList();//鎵�鏈夋湭浣跨敤锛堟湭琚垎閰嶇殑锛�
foreach (var ss in zt)
{
- var detailQty = int.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
+ var detailQty = decimal.Parse((ss.Qty - ss.LockQty - ss.FrozenQty).ToString());
if (needQty - qty < detailQty)
{
var num = needQty - qty;
@@ -206,7 +204,7 @@
/// <param name="dic"></param>
/// <param name="key"></param>
/// <param name="v"></param>
- private void SaveDic(Dictionary<int, int> dic, int key, int v)
+ private void SaveDic(Dictionary<int, decimal> dic, int key, decimal v)
{
if (dic.ContainsKey(key))
{
diff --git a/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs b/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs
index cc2dba3..5993cf9 100644
--- a/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BLLExportNoticeDetail.cs
@@ -66,28 +66,28 @@
/// Default:
/// Nullable:False
/// </summary>
- public int Qty {get;set;}
+ public decimal Qty {get;set;}
/// <summary>
/// Desc:鍒嗛厤鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? AllotQty {get;set;}
+ public decimal? AllotQty {get;set;}
/// <summary>
/// Desc:涓嬫灦鏁伴噺
/// Default:0
/// Nullable:True
/// </summary>
- public int? FactQty {get;set;}
+ public decimal? FactQty {get;set;}
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
/// Default:0
/// Nullable:True
/// </summary>
- public int? CompleteQty {get;set;}
+ public decimal? CompleteQty {get;set;}
/// <summary>
/// Desc:鍖呰缂栫爜
diff --git a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
index 87334f4..e69a17d 100644
--- a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
@@ -116,7 +116,7 @@
/// Default:
/// Nullable:False
/// </summary>
- public int Qty {get;set;}
+ public decimal Qty {get;set;}
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 68f194a..2be6a9d 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -189,6 +189,39 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
+ public IActionResult RequestRoadWay(RequestLocate model)
+ {
+ var logStr = "";
+
+ logStr = $@".\log\WCS\WCS鐢宠宸烽亾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
+ try
+ {
+
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"WCS鐢宠宸烽亾锛�( {jsonData} ),", logStr);
+
+ var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, model.HouseNo );
+
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+
+ return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// 鐢宠鍌ㄤ綅
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
public IActionResult RequestLocation(RequestLocate model)
{
--
Gitblit v1.8.0