From a5e8fb4e50f285538ad6800d5abdb66ea367db00 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 14 一月 2026 10:59:42 +0800
Subject: [PATCH] 添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能
---
WebTM/views/案例代码/华远/HY_HistogramReport.html | 311 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 292 insertions(+), 19 deletions(-)
diff --git "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html" "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
index 2c52ee3..32cf8a8 100644
--- "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
+++ "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
@@ -15,6 +15,26 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
+ <style>
+ .loader {
+ border: 8px solid #f3f3f3; /* Light grey */
+ border-top: 8px solid #3498db; /* Blue */
+ border-radius: 50%;
+ width: 50px;
+ height: 50px;
+ animation: spin 2s linear infinite;
+ }
+
+ @keyframes spin {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -41,10 +61,17 @@
<input type="text" class="layui-input" name="HBarCode_Set" id="HBarCode_Set">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<div class="layui-input-block" style="margin-left: 0px;">
<input type="checkbox" name="checkbox_isAVI" id="checkbox_isAVI" lay-skin="primary" lay-filter="checkbox_isAVI" checked title="AVI">
<input type="hidden" value="true" name="isAVI" id="isAVI" lay-verify="isAVI">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 0px;">
+ <input type="checkbox" name="checkbox_HBatchDeleteFlag" id="checkbox_HBatchDeleteFlag" lay-skin="primary" lay-filter="checkbox_HBatchDeleteFlag" title="鎵归噺鍒掑簾鍚姩鏍囪">
+ <input type="hidden" value="false" name="HBatchDeleteFlag" id="HBatchDeleteFlag" lay-verify="HBatchDeleteFlag">
+ <button type="button" id="HBatchDelete_submit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBatchDelete_submit">鎵归噺鍒掑簾</button>
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -55,7 +82,7 @@
</div>
<div id="HBadLabelNameList">
</div>
- <div id="HistogramReport" style = "background-color: black; height: 2000px; width: 100%; display: flex; flex-direction: column; align-items:center;">
+ <div id="HistogramReport" style = "background-color: black; height: 5000px; width: 100%; display: flex; flex-direction: column; align-items:center;">
</div>
</form>
@@ -84,6 +111,8 @@
var HLayOut_PNL = []; //PNL甯冨眬淇℃伅鏁版嵁
var HPCSNoList = []; //璁板綍甯冨眬涓婂凡缁忓姞鍏ョ殑PCS鍙�
+ var HBatchDeletePCSList = []; //鎵归噺鍒掑簾PCS鍒楄〃
+
var HBadLabelNameList = ["AOI1", "AOI2", "AOI3", "AOI4", "AVI", "MRB", "鐢垫祴"]; //妫�楠岀珯鍒爣绛惧悕绉版暟缁�
var HBadInfo = {}; //妫�楠岀珯鍒搴斾笉鑹暟閲�
for (var i = 0; i < HBadLabelNameList.length; i++) {
@@ -110,11 +139,32 @@
});
//#endregion
+ //#region 鎵归噺鍒掑簾
+ form.on('submit(HBatchDelete_submit)', function (data) {
+ batchDelete();
+ });
+ //#endregion
+
//#region AVI澶嶉�夋
form.on('checkbox(checkbox_isAVI)', function (data) {
$("#isAVI").val(data.elem.checked);
});
//#endregion
+
+ //#region 鎵归噺鍒掑簾鍚姩鏍囪 澶嶉�夋
+ form.on('checkbox(checkbox_HBatchDeleteFlag)', function (data) {
+ $("#HBatchDeleteFlag").val(data.elem.checked);
+
+ if (data.elem.checked) {
+ $('#HBatchDelete_submit').removeClass("layui-btn-disabled").attr("disabled", false);
+ } else {
+ HBatchDeletePCSList = [];
+ $("#btnSearch").trigger('click');
+ $('#HBatchDelete_submit').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ });
+ //#endregion
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -123,6 +173,8 @@
//鏌ヨ
get_FastQuery(1);
//Organ();
+
+ $('#HBatchDelete_submit').addClass("layui-btn-disabled").attr("disabled", true);
}
//#endregion
@@ -190,6 +242,9 @@
//娓呯┖PNL甯冨眬鏁版嵁
HLayOut_PNL = [];
+
+ //娓呯┖鎵归噺鍒掑簾PCS娓呭崟
+ HBatchDeletePCSList = [];
//鍏抽棴鍔犺浇閬僵
layer.close(ajaxLoad);
@@ -335,7 +390,11 @@
var HContainerElement_ColIndex = document.createElement('div'); //琛岀储寮曞鍣�
HContainerElement_ColIndex.style = "border: 2px solid black;color:white;";
HContainerElement_ColIndex.className = "layui-inline";
- HContainerElement_ColIndex.innerHTML = data[i]["HPosition_x"];
+ if (data[i]["HPosition_x"] * 1 < 10) {
+ HContainerElement_ColIndex.innerHTML = "0" + data[i]["HPosition_x"];
+ } else {
+ HContainerElement_ColIndex.innerHTML = data[i]["HPosition_x"];
+ }
if (data[i]["HSetNo"] == HSetNo && data[i]["HPosition_x"] != HPosition_x) { //鐩稿悓set瀹瑰櫒涓紝褰撳墠PCS鐨勮绱㈠紩涓庝笂涓�涓狿CS鐨勮绱㈠紩涓嶄竴鑷达紝鍒欐崲琛�
var HBrElement_PCS = document.createElement('br');
HCurrentElement_Set.appendChild(HBrElement_PCS);
@@ -435,23 +494,24 @@
var title = "PNL鏉＄爜缂栧彿锛�" + HBarCode_PNL_Note + "锛泂et鍙凤細" + SetNo + "锛汸CS鍙凤細" + PCSNo;
- var isAVI = $("#isAVI").val();
+ var HBatchDeleteFlag = $("#HBatchDeleteFlag").val();
- if (isAVI=="true") {
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: 'AVI鏂板锛�' + title + ')',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../../璐ㄩ噺绠＄悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempEdit.html?OperationType=6&linterid=&HSouceBillType=10004&HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&HPCSNo=" + PCSNo,
- end: function () {
- //鍒锋柊椤甸潰,
- get_FastQuery();
+ if (HBatchDeleteFlag == "true") {
+ var temp = {
+ "HBarCode": HBarCode_PNL_Note
+ , "HSetNo": SetNo
+ , "HPCSNo": PCSNo
+ , "title": "PNL鏉＄爜缂栧彿锛�" + HBarCode_PNL_Note + "锛泂et鍙凤細" + SetNo + "锛汸CS鍙凤細" + PCSNo
+ }
+ for (var i = 0; i < HBatchDeletePCSList.length; i++) {
+ if (temp.title == HBatchDeletePCSList[i].title) {
+ HBatchDeletePCSList.splice(i, 1);
+ $('#' + PCSNo_Button).removeClass("layui-btn-disabled");
+ return;
}
- });
+ }
+ HBatchDeletePCSList.push(temp);
+ $('#' + PCSNo_Button).addClass("layui-btn-disabled");
} else {
layer.open({
type: 2
@@ -491,13 +551,15 @@
}
// 渚嬪锛屽垱寤轰竴涓嚜瀹氫箟鑿滃崟
var HSelectElement = document.createElement('select');
+ HSelectElement.style.width = "100px";
+ HSelectElement.style.height = "20px";
HSelectElement.style.position = 'absolute';
HSelectElement.style.left = event.pageX + 'px';
HSelectElement.style.top = event.pageY + 'px';
HSelectElement.id = "HBadReason";
HSelectElement.name = "HBadReason";
HSelectElement.setAttribute('lay-filter', 'HBadReason');
- HSelectElement.className = "layui-form layui-form-item layui-row layui-input-inline";
+ HSelectElement.className = "layui-fluid layui-col-md12 layui-card-body layui-form layui-collapse layui-colla-item ayui-input-inline";
document.body.appendChild(HSelectElement);
setInitSelect_BadReason();
@@ -505,6 +567,22 @@
const selectElement = document.getElementById('HBadReason');
selectElement.addEventListener('change', function () {
var HBadReason = $("#HBadReason").val();
+ if (HBadReason == "") {
+ var HSelectElement = document.getElementById("HBadReason");
+ if (HSelectElement != null) {
+ document.body.removeChild(HSelectElement);
+ }
+ return;
+ }
+
+ if (!judgeRepeatDataByPNLAndPCS(HBarCode_PNL_Note, PCSNo)) {
+ layer.msg("璇CS宸茬粡瀛樺湪涓嶈壇璁板綍锛岀姝㈤噸澶嶆爣璁帮紒锛�", { icon: 5 });
+ var HSelectElement = document.getElementById("HBadReason");
+ if (HSelectElement != null) {
+ document.body.removeChild(HSelectElement);
+ }
+ return;
+ }
layer.open({
type: 2,
@@ -585,6 +663,7 @@
var data = result.data;
var Organization = "";
+ Organization += '<option style="color:blue;" value=""></option>';
for (var i = 0; i < data.length; i++) {
Organization += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
}
@@ -597,6 +676,200 @@
}
//#endregion
+ //#region 鎵归噺鍒掑簾
+ function batchDelete() {
+ if (HBatchDeletePCSList.length > 0) {
+ ////澶氭鎵归噺鍒掑簾鏃讹紝鍘婚櫎涓婁竴娆＄殑select缁勪欢
+ //var HSelectElement_old = document.getElementById("HBadReason");
+ //if (HSelectElement_old != null) {
+ // document.body.removeChild(HSelectElement_old);
+ //}
+
+ // 渚嬪锛屽垱寤轰竴涓嚜瀹氫箟鑿滃崟
+ var HSelectElement = document.createElement('select');
+ HSelectElement.style.width = "100px";
+ HSelectElement.style.height = "20px";
+ HSelectElement.style.position = 'absolute';
+ HSelectElement.style.left = event.pageX + 'px';
+ HSelectElement.style.top = event.pageY + 'px';
+ HSelectElement.id = "HBadReason";
+ HSelectElement.name = "HBadReason";
+ HSelectElement.setAttribute('lay-filter', 'HBadReason');
+ HSelectElement.className = "layui-fluid layui-col-md12 layui-card-body layui-form layui-collapse layui-colla-item ayui-input-inline";
+ document.body.appendChild(HSelectElement);
+ setInitSelect_BadReason();
+
+ //涓嶈壇鍘熷洜閫夋嫨鎺т欢 鍊煎彉鍖栫洃鍚�
+ const selectElement = document.getElementById('HBadReason');
+ selectElement.addEventListener('change', function () {
+ var HBadReason = $("#HBadReason").val();
+ if (HBadReason == "") {
+ var HSelectElement = document.getElementById("HBadReason");
+ if (HSelectElement != null) {
+ document.body.removeChild(HSelectElement);
+ }
+ layer.alert("鎵归噺浣滃簾澶辫触锛屾湭閫夋嫨涓嶈壇椤圭洰!!!", { icon: 5 });
+ return;
+ }
+
+ for (var i = 0; i < HBatchDeletePCSList.length; i++) {
+ var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
+ var PCSNo = HBatchDeletePCSList[i].HPCSNo;
+ if (!judgeRepeatDataByPNLAndPCS(HBarCode_PNL_Note, PCSNo)) {
+ layer.msg("PCS銆�" + PCSNo + "銆戝凡缁忓瓨鍦ㄤ笉鑹褰曪紝绂佹閲嶅鏍囪锛侊紒", { icon: 5 });
+
+ var HSelectElement = document.getElementById("HBadReason");
+ if (HSelectElement != null) {
+ document.body.removeChild(HSelectElement);
+ }
+
+ return;
+ }
+ }
+
+ //鑾峰彇闇�瑕佷笂浼犵殑妫�楠屼俊鎭垪琛�
+ var HDataList_submit = [];
+ for (var i = 0; i < HBatchDeletePCSList.length; i++) {
+ var title = HBatchDeletePCSList[i].title;
+ var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
+ var SetNo = HBatchDeletePCSList[i].HSetNo;
+ var PCSNo = HBatchDeletePCSList[i].HPCSNo;
+
+ var data = {
+ HBarCode: HBarCode_PNL_Note
+ , HSetNo: SetNo
+ , HPCSNo: PCSNo
+ , HCheckProc: "MRB"
+ , HPageIndex: "L4"
+ , HBadReason: HBadReason
+ , HPosition_x: "0"
+ , HPosition_y: "0"
+ , HItemID: "0"
+ , HMakeDate: Format(new Date(), "yyyy-MM-dd")
+ , HMaker: sessionStorage["HUserName"]
+ }
+ HDataList_submit.push(data);
+ }
+
+ batchDelete_Submit(HDataList_submit);
+
+ HBatchDeletePCSList = [];
+ $("#btnSearch").trigger('click');
+
+ var HSelectElement = document.getElementById("HBadReason");
+ if (HSelectElement != null) {
+ document.body.removeChild(HSelectElement);
+ }
+ });
+
+ //涓嶈壇鍘熷洜閫夋嫨鎺т欢 澶辩劍鏃剁Щ闄ゆ帶浠�
+ selectElement.focus();
+ selectElement.addEventListener('blur', function () {
+ var HSelectElement = document.getElementById("HBadReason");
+ if (HSelectElement != null) {
+ document.body.removeChild(HSelectElement);
+ }
+ });
+ } else {
+ layer.alert("褰撳墠鏈�変腑闇�瑕佸垝搴熺殑PCS!!!", { icon: 5 });
+ }
+ }
+ //#endregion
+
+ //#region 鎵归噺鍒掑簾-涓婁紶妫�楠屼俊鎭褰�
+ function batchDelete_Submit(HDataList_submit) {
+ var msg = ""; //杩斿洖淇℃伅
+
+ //閬嶅巻涓婁紶
+ var submitList = []; //涓婁紶鏁版嵁鍒楄〃
+ var submitCount = 100; //鍗曟鍙笂浼犳暟閲�+1
+ for (var i = 0; i < HDataList_submit.length; i++) {
+ if ((i + 1) % submitCount > 0 && i + 1 != HDataList_submit.length) {
+ submitList.push(HDataList_submit[i]);
+ } else {
+ //鎵撳紑鍔犺浇閬僵
+ var index = layer.open({
+ type: 1, // page 灞傜被鍨�
+ area: ['20%', '20%'],
+ shade: 0.6, // 閬僵閫忔槑搴�
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+ anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
+ });
+
+ submitList.push(HDataList_submit[i]);
+ var sMainStr = JSON.stringify(submitList) + ';' + sessionStorage["HUserName"];
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/BatchAddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //鍏抽棴鍔犺浇閬僵
+ layer.close(index);
+ }
+ else {
+ for (var j = 0; j < submitList.length; j++) {
+ msg += "銆�" + submitList.HPCSNo + "銆�";
+ }
+ msg += "涓婁紶澶辫触锛屽師鍥狅細" + data.Message + ";";
+ //鍏抽棴鍔犺浇閬僵
+ layer.close(index);
+ }
+ },
+ error: function (err) {
+ for (var j = 0; j < submitList.length; j++) {
+ msg += "銆�" + submitList.HPCSNo + "銆�";
+ }
+ msg += "涓婁紶澶辫触锛屽師鍥狅細" + err.Message + ";";
+ //鍏抽棴鍔犺浇閬僵
+ layer.close(index);
+ }
+ });
+
+ submitList = [];
+ }
+ }
+
+
+ if (msg.length > 0) {
+ layer.alert(msg, { icon: 5 });
+ return false;
+ } else {
+ return true;
+ }
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇璇NL涓嬬殑璇CS鏄惁宸茬粡瀛樺湪涓嶈壇璁板綍銆傝嫢瀛樺湪锛屽垯涓嶅厑璁哥户缁敓鎴愩��
+ function judgeRepeatDataByPNLAndPCS(HBarCode_Temp, HPCSNo_Temp) {
+ var flag = true;
+ var sql = "select HBarCode from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
+ sql += " union select HBarCode from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async: false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length > 0) {
+ flag = false;
+ }
+ } else {
+ flag = false;
+ }
+ }, error: function (e) {
+ flag = false;
+ }
+ });
+ return flag;
+ }
+ //#endregion
//#endregion
});
</script>
--
Gitblit v1.9.1