From fb8a9fbc15b917ff3d36eb30e28633a413ff0a42 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 04 八月 2025 10:17:38 +0800
Subject: [PATCH] 页面过滤条件：开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图：x轴lot号，y轴良品率。根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录)，然后根据料号、批次分组合计得到该料号每个批次的不良PCS的数量合计。然后获取该料号每个批次中PNL条码的数量(PNL条码不能重复)并乘PNL布局信息中子表的记录数(该料号中的PCS数量)得到每个批次的PCS总数。对每个批次进行((PCS总数-不良PCS数量)/PCS总数 *100)得到每个批次的良品率。 3.饼状图：根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录)，然后根据检验信息中的不良原因分组统计各个原因的数量。在饼状图显示 4.表格：根据开始时间和结束时间、站台、料号 过滤检验信息，表头包含(站台、料号、PNL条码、PCS号、正反面、不良原因)，并针对表头字段进行去重
---
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 38 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
index cceb3d2..8bb9d56 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/qrcode/qrcode.min.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -37,30 +38,26 @@
</div>
<!--宸蹭笂浼犲垪琛�-->
<div class="layui-tab-item">
- <div class="layui-form-item" style="padding: 0px; margin: 0px">
- <div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-form-item" style="padding: 10px; margin: 0px">
+ <div class="layui-row" style="margin-top: -10px;">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs9">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs9">
<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
- <div class="layui-col-xs6">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
- </div>
- <div class="layui-col-xs4">
- <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
- </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
+ <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+ <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
</div>
<div class="layui-row">
<div class="layui-col-xs12">
@@ -73,17 +70,20 @@
</div>
</div>
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:0px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
</div>
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
</div>
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
</div>
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
</div>
<!--澶辫触鎻愮ず闊�-->
@@ -123,6 +123,7 @@
var Uploadedoption = []; //宸蹭笂浼犲垪琛�
var columns = "";
var Uploadedcolumns = "";
+ var MvarReportTitle = "鐢熶骇鍏ュ簱鍗曠紦瀛樺垪琛�";
var HModName = "Kf_ProductInBillList_PDA";
var ModRightName = "CE_ProductIn"; //妯″潡鏉冮檺鍙傛暟
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
@@ -152,7 +153,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -274,12 +275,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -290,6 +291,46 @@
//#endregion
+ //#region 鏄剧ず浜岀淮鐮�
+
+ form.on('submit(cmdQRCode)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ showQRCode(data[0].鍗曟嵁鍙�, "鍗曟嵁浜岀淮鐮�");
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+
+ //#endregion
//#region 鍒犻櫎鍔熻兘鎺т欢
@@ -304,7 +345,7 @@
type: "Get",
url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID, "MvarReportTitle": MvarReportTitle },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -315,12 +356,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -374,14 +415,14 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, 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: 150 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
} else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left' });
}
}
}
@@ -405,7 +446,7 @@
//listOption.totalRow = true;
table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -468,15 +509,15 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, 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 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
- if (data[i].name == '鏁伴噺') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
- }
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 80 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
}
}
}
@@ -502,7 +543,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -522,9 +563,9 @@
$.ajax(
{
type: "Get",
- url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+ url: GetWEBURL() + "/WEBSController/set_DeleteICStockBillAndWMS_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -538,12 +579,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
--
Gitblit v1.9.1