From 87f317bc78170a2ca82b7367715ab3a71103318c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 29 七月 2024 16:31:49 +0800
Subject: [PATCH] 扫码验证单：获取 补扫清单
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
WebTM/views/WMS扫码模块/扫码验证/Gy_BarCodeConfirmBill_PDA.html | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index ca8065e..f818d45 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -2013,7 +2013,7 @@
<publishTime>07/25/2024 11:21:38</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鎵爜楠岃瘉/Gy_BarCodeConfirmBill_PDA.html">
- <publishTime>07/25/2024 13:25:01</publishTime>
+ <publishTime>07/29/2024 15:15:30</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鏉＄爜鍑哄叆搴撴煡璇�/Gy_BarCodeBillInOut__PDA.html">
<publishTime>03/05/2024 12:29:40</publishTime>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html"
index 7f42e34..620c40d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\253\347\240\201\351\252\214\350\257\201/Gy_BarCodeConfirmBill_PDA.html"
@@ -54,15 +54,20 @@
</div>
</div>
</div>
- <div class="layui-tab" lay-filter="tab-Sc_PackUnionBill_PDA">
+ <div class="layui-tab" lay-filter="tab-Gy_BarCodeConfirmBill_PDA">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1">鎵爜淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
+ <li lay-id="2">琛ユ壂淇℃伅</li>
+ <li lay-id="3">鍗曟嵁淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鎵爜淇℃伅-->
<div class="layui-tab-item">
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ <!--琛ユ壂娓呭崟淇℃伅-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="wl-table1" lay-filter="wl-table1"></table>
</div>
<!--鍗曟嵁淇℃伅-->
<div class="layui-tab-item">
@@ -108,8 +113,11 @@
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
</div>
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdExport">瀵煎嚭</button>
+ </div>-->
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSuppRush">琛ユ壂娓呭崟</button>
</div>
</div>
</div>
@@ -149,6 +157,7 @@
var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"]
var option = [];
+ var option1 = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -265,6 +274,9 @@
//#region 鏄剧ず瀹㈡埛鐗╂枡鏉＄爜鍒楄〃淇℃伅
function DisBillEntryList() {
+ //鍒囨崲椤电涓烘壂鐮佸垪琛�
+ element.tabChange('tab-Gy_BarCodeConfirmBill_PDA', '1');
+
var ajaxLoad = layer.load();
$.ajax({
type: "GET",
@@ -470,6 +482,12 @@
get_Export();
})
//#endregion
+
+ //#region 琛ユ壂娓呭崟 鍔熻兘鎺т欢
+ form.on('submit(cmdSuppRush)', function () {
+ get_SuppRushList();
+ })
+ //#endregion
//#endregion
@@ -493,6 +511,30 @@
function set_InitGrid() {
option = {
elem: '#wl-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 100000
+ //, limits: [50, 500, 5000, 20000]
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', hide: true }
+ , { field: 'HInterID', title: 'HInterID', hide: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 125, sort: true }
+ , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 125, sort: true, hide: true }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 125, sort: true }
+ , { field: 'HQty', title: '鏁伴噺', width: 125, sort: true, totalRow: true, hide: true }
+ , { field: 'HOrgID', title: 'HOrgID', sort: true, hide: true }
+ , { field: 'HDate', title: '鏃ユ湡', width: 125, sort: true }
+ , { field: 'HRelationInterID', title: 'HRelationInterID', width: 125, sort: true, hide: true }
+ , { field: 'HMaker', title: '鎵爜浜�', width: 125, sort: true }
+ ]]
+ };
+
+ option1 = {
+ elem: '#wl-table1'
, height: 'full-50'
//, page: true
, cellMinWidth: 90
@@ -578,6 +620,63 @@
//});
}
//#endregion
+
+ //#region 琛ユ壂娓呭崟
+ function get_SuppRushList() {
+ //鍒囨崲椤电涓鸿ˉ鎵竻鍗�
+ element.tabChange('tab-Gy_BarCodeConfirmBill_PDA', '2');
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/Gy_BarCodeConfirmBill_getSuppRushList',
+ async: false,
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HOrgID": HStockOrgID },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ col.push({ type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+ option1.cols = [col];
+ option1.data = data1.data;
+ table.cache['wl-table1'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(option1);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#endregion
});
--
Gitblit v1.9.1