From bcb9d3000b0cd83e3eed468236be133d430b9852 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十二月 2023 13:32:15 +0800
Subject: [PATCH] 单品过站优化
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 115 +++++++++++++++++++++++-----
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 67 ++++++++--------
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 2
3 files changed, 130 insertions(+), 54 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 421d2d5..c82691e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -1,7 +1,8 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta name="renderer" content="ie-comp" />
<title>鎵撳嵃</title>
<script src="../../CreateControl.js"></script>
<script src="../../GRInstall.js"></script>
@@ -14,42 +15,42 @@
</style>
<script type="text/javascript">
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
}
- return vars;
- }
- //鍦ㄧ綉椤靛垵濮嬪姞杞芥椂鍚戞姤琛ㄦ彁渚涙暟鎹�
- function window_onload() {
- var ReportViewer = document.getElementById("ReportViewer");
- // ReportViewer.Stop();
- var Report = ReportViewer.Report;
- //寮�鍚姤琛ㄧ敓鎴愯繘搴︽潯鏄剧ず
- //ReportViewer.Report.ShowProgressUI = true;
- Report.OnPrintBegin = OnPrintBegin;
- Report.OnPrintEnd = OnPrintEnd;
+ //鍦ㄧ綉椤靛垵濮嬪姞杞芥椂鍚戞姤琛ㄦ彁渚涙暟鎹�
+ function window_onload() {
+ var ReportViewer = document.getElementById("ReportViewer");
+ // ReportViewer.Stop();
+ var Report = ReportViewer.Report;
+ //寮�鍚姤琛ㄧ敓鎴愯繘搴︽潯鏄剧ず
+ //ReportViewer.Report.ShowProgressUI = true;
+ Report.OnPrintBegin = OnPrintBegin;
+ Report.OnPrintEnd = OnPrintEnd;
- ReportViewer.Start();
- }
- //function OnPrintEnd() {
- // if (PrintCount == 0) {
- // var LCStatus = sessionStorage.getItem("LCStatus");
- // if (LCStatus == "Print")//鎵撳嵃鐘舵��
- // {
- // SaveLabelPrint(sessionStorage.getItem("LabelJson"));
- // PrintCount = 1;
- // }
- // }
+ ReportViewer.Start();
+ }
+ //function OnPrintEnd() {
+ // if (PrintCount == 0) {
+ // var LCStatus = sessionStorage.getItem("LCStatus");
+ // if (LCStatus == "Print")//鎵撳嵃鐘舵��
+ // {
+ // SaveLabelPrint(sessionStorage.getItem("LabelJson"));
+ // PrintCount = 1;
+ // }
+ // }
- //}
- //function OnPrintBegin() {
+ //}
+ //function OnPrintBegin() {
- //}
+ //}
</script>
</head>
<body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index ce66e1a..cc50e32 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -13,7 +13,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/PubCustom.js"></script>-->
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../CreateControl.js"></script>
</head>
<body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index fb84450..e01992c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -307,6 +307,7 @@
var option = [];
var option2 = [];
var option3 = [];
+ var setIntervalIndex = null;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -356,7 +357,7 @@
txtHBarCode_KeyDown(HBarCode);
}
});
-
+
//娴佽浆鍗″洖杞︽柟娉�
$('#HBardCodeProcExchBillNo').on('keydown', function (event) {
var HBarCode = $('#HBardCodeProcExchBillNo').val();
@@ -365,18 +366,22 @@
layer.msg("娴佽浆鍗′笉鑳戒负绌猴紒")
return;
}
+ setIntervalIndex = setInterval(setIntervalList, 30000);
get_BomList(HBarCode);
- if (option.data != 0) {
- //淇濆瓨鍒颁复鏃惰〃
- get_AddBomTempList();
- }
+ //if (option.data != 0) {
+ // //淇濆瓨鍒颁复鏃惰〃
+ // get_AddBomTempList();
+ //}
//鏌ヨ涓嶈壇璁板綍
- get_BadRecords(HBarCode);
+ get_BadRecords();
//鏌ヨ鍚堟牸璁板綍
get_HGRecords();
- //鏌ヨ鎬绘暟閲�
+
+
}
});
+
+
//閰嶄欢鍥炶溅鏂规硶
$('#HBardCodeMater').on('keydown', function (event) {
@@ -464,7 +469,8 @@
get_Display();
get_CriticalPartsList();//鍏抽敭浠舵竻鍗� 涓嶈壇璁板綍 鍚堟牸璁板綍
-
+
+
}
// 鐢熸垚鍗曟嵁鍙�
@@ -624,19 +630,21 @@
}
//鏌ヨ涓嶈壇璁板綍
- function get_BadRecords(HBarCode) {
+ function get_BadRecords() {
var ajaxLoad = layer.load();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+ var HProcExchEntryID = $("#HProcExchEntryID").val();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
type: "GET",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "HProcExchInterID": HProcExchInterID, "HProcExchEntryID": HProcExchEntryID, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- option2.data = data1.data;
+ option2.data = data1.data.h_p_Gy_BadRecordsList;
table.render(option2);
- $("#HBadCount").val(data1.data.length);
+ $("#HBadCount").val(data1.data.h_p_Gy_BadRecordsList1.length - data1.data.h_p_Gy_BadRecordsList2.length);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -754,7 +762,7 @@
layer.msg("鍒犻櫎鎴愬姛锛�");
layer.close(ajaxLoad);
//鏌ヨ涓嶈壇璁板綍
- get_BadRecords($("#HBardCodeProcExchBillNo").val());
+ get_BadRecords();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(ajaxLoad);
@@ -836,6 +844,18 @@
option.data = data1.data;
table.render(option)
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (parseFloat(option.data[i]["閰嶄欢鏁伴噺"]) == 0) {
+ if (setIntervalIndex != null) {
+ //clearInterval(setIntervalIndex);
+ //setIntervalIndex = null;
+ clearTimerQ();
+ }
+ return layer.msg("閰嶄欢鏁伴噺涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }
+
}
else if (data1.count == 2) {
layer.close(index);
@@ -860,6 +880,7 @@
$("#HICMOQty").val(data1.data[0]["HICMOQty"]);
createBillNo();
+
} else {
layer.close(index);
layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -871,6 +892,38 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+ }
+
+ function clearTimerQ() {
+ try {
+ window.clearInterval(setIntervalIndex)
+ } catch (error) { }
+ window.setIntervalIndex = null
+ }
+
+ function setIntervalList() {
+ clearTimerQ();
+
+ var HBarCode = $('#HBardCodeProcExchBillNo').val();
+
+ if (!HBarCode) {
+ layer.msg("娴佽浆鍗′笉鑳戒负绌猴紒")
+ return;
+ }
+ if (option2.data.length != 0 || option3.data.length != 0) {
+ get_BomList(HBarCode);
+ }
+
+ //if (option.data != 0) {
+ // //淇濆瓨鍒颁复鏃惰〃
+ // get_AddBomTempList();
+ //}
+ //鏌ヨ涓嶈壇璁板綍
+ get_BadRecords();
+ //鏌ヨ鍚堟牸璁板綍
+ get_HGRecords();
+
+ setIntervalIndex = setInterval(setIntervalList, 30000);
}
//閰嶄欢鏌ヨ鏁版嵁
@@ -898,23 +951,25 @@
option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
option.data[i]["HBarCode"] = HBarCode;
table.render(option);
+
+ PD_HBatchNo();
});
break;
}
+
if (data1.data[0]["HMaterNumber"] == option.data[i]["閰嶄欢浠ｇ爜"]) {
option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
option.data[i]["HBarCode"] = HBarCode;
- KNum += 1;
+
table.render(option);
-
- if (KNum == option.data.length) {
- layer.msg("鎵规宸插叏閮ㄥ尮閰�!");
- }
+ PD_HBatchNo();
break;
}
}
+
+
$('#HBardCodeMater').val("");
}
else {
@@ -928,6 +983,26 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+ }
+
+ //鍒ゆ柇鎵规鏄惁鍖归厤瀹�
+ function PD_HBatchNo() {
+ for (var i = 0; i < option.data.length; i++) {
+ if (parseFloat(option.data[i]["閰嶄欢鏁伴噺"]) != 0 && option.data[i]["閰嶄欢鏁伴噺"] != null) {
+ KNum += 1;
+ }
+ if (KNum == option.data.length) {
+ layer.msg("鎵规宸插叏閮ㄥ尮閰�!");
+ if (setIntervalIndex != null) {
+ clearInterval(setIntervalIndex);
+ setIntervalIndex = null;
+ }
+ setIntervalIndex = setInterval(setIntervalList, 30000);
+
+ get_AddBomTempList();
+ }
+ }
+ KNum = 0;
}
//淇濆瓨閰嶄欢鍒颁骇绾跨粍瑁呭崟涓存椂琛�
@@ -1126,7 +1201,7 @@
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val() + '&HProcExchBillNo=' + $("#HProcExchBillNo").val(), 'yes']
, end: function () {
- get_BadRecords($("#HBardCodeProcExchBillNo").val());
+ get_BadRecords();
}
})
}
@@ -1164,7 +1239,7 @@
//鏌ヨ鍚堟牸璁板綍
get_HGRecords();
//鏌ヨ涓嶈壇璁板綍
- get_BadRecords(HBardCodeProcExchBillNo);
+ get_BadRecords();
}
else {
layer.close(index);
--
Gitblit v1.9.1