From 3c39510f9cde5772dc343050f2bdf50460d6a912 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 04 三月 2024 16:54:31 +0800
Subject: [PATCH] 增加手动分配寄存显示备注功能，调整后台逻辑代码。
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 4 +
HTML/views/SOSetting/ExportHandOutList.html | 203 +++++++++++++++++++++++++++++++++++---------------
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 8 ++
HTML/views/SOSetting/ExportNotice.html | 2
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 4 +
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 1
6 files changed, 160 insertions(+), 62 deletions(-)
diff --git a/HTML/views/SOSetting/ExportHandOutList.html b/HTML/views/SOSetting/ExportHandOutList.html
index b1bad3d..73ace4e 100644
--- a/HTML/views/SOSetting/ExportHandOutList.html
+++ b/HTML/views/SOSetting/ExportHandOutList.html
@@ -95,6 +95,134 @@
var repeatClick = true;
var tableIns;
refreshTable();
+ //姝ｅ父鏄剧ず
+ var colsa =
+ [[
+ {
+ field: 'LocatNo',
+ title: '鍌ㄤ綅缂栫爜',
+ align: 'center',
+ width: 110,
+ fixed: 'left',
+ },{
+ field: 'PalletNo',
+ title: '鎵樼洏鏉＄爜',
+ align: 'center',
+ width: 100,
+ fixed: 'left',
+ }, {
+ field: 'SkuNo',
+ title: '鐗╁搧缂栫爜',
+ width: 100,
+ align: 'center',
+ fixed: 'left',
+ }, {
+ field: 'SkuName',
+ title: '鐗╁搧鍚嶇О',
+ minWidth: 200,
+ align: 'center',
+ fixed: 'left',
+ }, {
+ field: 'LotNo',
+ title: '鎵规',
+ align: 'center'
+ }, {
+ field: 'LotText',
+ title: '鎵规鎻忚堪',
+ align: 'center',
+ }, {
+ field: 'Standard',
+ title: '鐗╁搧瑙勬牸',
+ align: 'center',
+ minWidth: 100
+ }, {
+ field: 'RoadwayNo',
+ title: '鎵�灞炲贩閬�',
+ align: 'center',
+ width: 100
+ }, {
+ field: 'Qty',
+ title: '搴撳瓨鏁伴噺',
+ width: 100,
+ fixed: 'right',
+ align: 'center',
+ }, {
+ field: 'ExportQty',
+ title: '鍑哄簱鏁伴噺',
+ align: 'center',
+ width: 100,
+ fixed: 'right',
+ edit: 'number',
+ event: 'dataNumber',
+ }
+ ]];
+ //瀵勫瓨鏄剧ず
+ var colsb =
+ [[
+ {
+ field: 'LocatNo',
+ title: '鍌ㄤ綅缂栫爜',
+ align: 'center',
+ width: 110,
+ fixed: 'left',
+ },{
+ field: 'PalletNo',
+ title: '鎵樼洏鏉＄爜',
+ align: 'center',
+ width: 100,
+ fixed: 'left',
+ }, {
+ field: 'SkuNo',
+ title: '鐗╁搧缂栫爜',
+ width: 100,
+ align: 'center',
+ fixed: 'left',
+ }, {
+ field: 'SkuName',
+ title: '鐗╁搧鍚嶇О',
+ minWidth: 200,
+ align: 'center',
+ fixed: 'left',
+ }, {
+ field: 'LotNo',
+ title: '鎵规',
+ align: 'center'
+ }, {
+ field: 'LotText',
+ title: '鎵规鎻忚堪',
+ align: 'center',
+ }, {
+ field: 'Standard',
+ title: '鐗╁搧瑙勬牸',
+ align: 'center',
+ minWidth: 100
+ }, {
+ field: 'Demo',
+ title: '澶囨敞',
+ align: 'center',
+ width: 100
+ }, {
+ field: 'RoadwayNo',
+ title: '鎵�灞炲贩閬�',
+ align: 'center',
+ width: 100
+ },{
+ field: 'Qty',
+ title: '搴撳瓨鏁伴噺',
+ width: 100,
+ fixed: 'right',
+ align: 'center',
+ }, {
+ field: 'ExportQty',
+ title: '鍑哄簱鏁伴噺',
+ align: 'center',
+ width: 100,
+ fixed: 'right',
+ edit: 'number',
+ event: 'dataNumber',
+ }
+ ]];
+
function refreshTable() {
detailId = getQueryString('Id');
var param = {
@@ -107,12 +235,21 @@
};
sendData(IP + "/BllSo/GetHandOutList", param, 'post', function(res) {
if (res.code == 0) { //鎴愬姛
+
var list = res.data;
$.extend(infoOptions, {
data: list
});
infoOptions.page = {
curr: 1
+ }
+ infoOptions.cols = colsa;
+ //鍒ゆ柇鍗曟嵁鏄庣粏淇℃伅鏄惁涓哄瘎瀛樻槑缁�
+ if(res.data[0].SkuNo == "100088")
+ {
+ infoOptions.cols = colsb;
+ // colsa = colsb;
+ console.log(colsa)
}
tableIns = table.render(infoOptions);
} else { //涓嶆垚鍔�
@@ -131,6 +268,7 @@
}
});
}
+
var infoOptions = {
elem: '#LAY-app-content-list',
height: 'full-160',
@@ -139,67 +277,10 @@
limit: pageCnt,
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- cols: [
- [ //鏍囬鏍�
- {
- field: 'LocatNo',
- title: '鍌ㄤ綅缂栫爜',
- align: 'center',
- width: 110,
- fixed: 'left',
- },{
- field: 'PalletNo',
- title: '鎵樼洏鏉＄爜',
- align: 'center',
- width: 100,
- fixed: 'left',
- }, {
- field: 'SkuNo',
- title: '鐗╁搧缂栫爜',
- width: 100,
- align: 'center',
- fixed: 'left',
- }, {
- field: 'SkuName',
- title: '鐗╁搧鍚嶇О',
- minWidth: 200,
- align: 'center',
- fixed: 'left',
- }, {
- field: 'LotNo',
- title: '鎵规',
- align: 'center'
- }, {
- field: 'LotText',
- title: '鎵规鎻忚堪',
- align: 'center',
- }, {
- field: 'Standard',
- title: '鐗╁搧瑙勬牸',
- align: 'center',
- minWidth: 100
- }, {
- field: 'RoadwayNo',
- title: '鎵�灞炲贩閬�',
- align: 'center',
- width: 100
- }, {
- field: 'Qty',
- title: '搴撳瓨鏁伴噺',
- width: 100,
- fixed: 'right',
- align: 'center',
- }, {
- field: 'ExportQty',
- title: '鍑哄簱鏁伴噺',
- align: 'center',
- width: 100,
- fixed: 'right',
- edit: 'number',
- event: 'dataNumber',
- }
- ]
- ],
+ cols: null,
+ //鏍囬鏍�
+
+
};
//鑾峰彇浠撳簱涓嬫媺妗嗘暟鎹�
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index a4f6dd1..b8e85a1 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -336,7 +336,7 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- if(d.type != "8") {
+ if(d.Type != "8") {
html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
<i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
</a>`;
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index bf0b02a..3c1efd9 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -178,5 +178,13 @@
/// Nullable:True
/// </summary>
public string OwnerName { get; set; }
+
+
+ /// <summary>
+ /// Desc:澶囨敞
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string Demo { get; set; }
}
}
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 0a362ba..3593c83 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1556,6 +1556,7 @@
PackagNo = noticeDetail.PackagNo,
IsBale = item.IsBale,
IsBelt = item.IsBelt,
+ Demo = item.Demo,
OwnerNo = ownerNo,
OwnerName = ownerName,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 5afee30..c57bae9 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1809,6 +1809,10 @@
{
model.LotNo = model.LotNo.Substring(indexOfDash + 1);
}
+ else
+ {
+ model.LotNo = "";
+ }
}
//鍒ゆ柇鐗╂枡鏁伴噺鏄惁涓�0 涓�0鍒ゆ柇绠辩爜淇℃伅 涓嶄负0缁х画
if (model.SkuQty == 0)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 20f3e34..20dcf0a 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -361,6 +361,9 @@
case "6"://浠ｅ偍鍑哄簱
skuType = "(2)";
break;
+ case "8"://瀵勫瓨鍑哄簱
+ skuType = "(3)";
+ break;
default: //鍏跺畠鍑哄簱
skuType = "(0,1,2,3,4)";
break;
@@ -2573,6 +2576,7 @@
LocatNo = a.LocatNo,
RoadwayNo = a.RoadwayNo,
PalletNo = a.PalletNo,
+ Demo = a.Demo,
}).ToList();
return list;
--
Gitblit v1.8.0