From a961353471623d780a2e51f410d002a11ab60211 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 13 十二月 2024 10:10:51 +0800
Subject: [PATCH] 优化出厂检验单,设备履历报表,异常反馈单
---
WebTM/WebTM.csproj.user | 4
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 78 +++++++++++++++++++++++++
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 11 ++-
WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html | 32 ++++++----
4 files changed, 105 insertions(+), 20 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f96700a..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 764b124..bae14aa 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -323,7 +323,8 @@
<label class="layui-form-label">褰卞搷闈㈢▼搴�:</label>
<div class="layui-input-inline">
<select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
- <option value="鏃犳硶鍒ゆ柇" selected="selected">鏃犳硶鍒ゆ柇</option>
+ <option value="" selected="selected"></option>
+ <option value="鏃犳硶鍒ゆ柇">鏃犳硶鍒ゆ柇</option>
<option value="鍋滅嚎">鍋滅嚎</option>
<option value="鎵归噺涓嶈壇">鎵归噺涓嶈壇</option>
<option value="鍋跺彂涓嶈壇">鍋跺彂涓嶈壇</option>
@@ -827,6 +828,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HCenterName").val(sessionStorage["HWorkCenter"]); //宸ヤ綔涓績
$("#HCenterID").val(sessionStorage["HWorkCenterID"]); //宸ヤ綔涓績
+ $("#HReceiveMan").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
}
//鏈夋簮鍗曟柊澧�
@@ -839,7 +841,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
-
+ $("#HReceiveMan").val(sessionStorage["HUserName"]); //鎺ユ敹浜�
$.ajax(
{
type: "GET",
@@ -1649,7 +1651,10 @@
layer.msg("QE璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
-
+ if ($("#HErrLev").val() == '' || $("#HErrLev").val() == null) {
+ layer.msg("褰卞搷闈㈢▼搴︿笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (OperationType == "2") {
if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
index 8a1d346..8a2c40c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
@@ -127,8 +127,8 @@
//閫�鍑烘寜閽�
case 'get_Exit': get_Exit();
break;
- //閫�鍑烘寜閽�
- case 'get_Search': get_DisplayResume();
+ //鏌ヨ灞ュ巻鎸夐挳
+ case 'get_Search': get_DisplayLV();
break;
};
});
@@ -313,24 +313,14 @@
}
//鏌ヨ灞ュ巻
- function get_DisplayResume(HInterID) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (OperationType!=3) {
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].hmainid.toString();
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
- return;
- }
- }
+ function get_DisplayResume(HInterID) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
type: "GET",
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.code == 1) {
var data = [];
var col = [];
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
@@ -376,6 +366,20 @@
}
+ //鍏ㄧ▼鎶ヨ〃璺宠浆鍚�,鍦ㄩ〉闈㈢偣鍑绘煡璇㈠饱鍘嗘柟娉�
+ function get_DisplayLV() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ get_DisplayResume(HInterID);
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ return;
+ }
+
+ }
+
//蹇�熻繃婊�
function get_FastQuery() {
var HNumber = $("#HNumber").val();
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 8d6a050..739a2f0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -1683,6 +1683,82 @@
}
});
+ //#region 銆愬簾寮冧唬鐮�(鏂帿灏斿凡鍚敤)銆�
+ table.on('edit(mainTable)', function (obj) {
+ var cell = $(this);
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = rowIndex;
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
+ switch (field) {
+ case "HInspectVal": //妫�楠屽��
+ value = isNaN(value) ? 0 : parseFloat(value);
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
+ LastResult();
+ }
+ break;
+ case "HTargetVal": //鐩爣鍊�
+ value = isNaN(value) ? 0 : value;
+
+
+ break;
+ default:
+ }
+ });
+
+ function createArr(rowIndex) {
+ var arr_value = table.cache['ValueTable']; //鑾峰彇妫�娴嬪�煎崟鍏冩牸鏁版嵁
+
+ arr_value_add = []; //鏂板琛屽彿瀛楁
+ arr_value.map((item, index) => {
+ arr_value_add.push(Object.assign({}, item, { rowNum: rowIndex }))
+ })
+
+ if (Array.length > 0) {//濡傛灉鏁扮粍涓嶄负绌哄垯閬嶅巻鏁扮粍
+ var whetherAdd = false; //鏄惁宸茬粡娣诲姞杩囧綋鍓嶈鍙风殑鏁扮粍
+ //閬嶅巻鏁扮粍
+ Array.some(item => {
+ if (item[0].rowNum == rowIndex) {
+ whetherAdd = true;
+ return true;//璺冲嚭閬嶅巻
+ } else {
+ whetherAdd = false;
+ }
+ })
+ //娌℃湁娣诲姞杩囧綋鍓嶈鍙风殑鏁扮粍鍒欐坊鍔犺繘鍘�
+ if (whetherAdd == false) {
+ Array.push(arr_value_add);
+ }
+ } else {
+ Array.push(arr_value_add);//鏁扮粍涓虹┖鍒欎笉鍋氬垽鏂紝鐩存帴鎶婃暟鎹坊鍔犺繘鏁扮粍
+ }
+ }
+ //#endregion
+
//#endregion
//#region 鏂囨湰妗嗙洃鍚紝鍏夋爣绉诲紑鏃惰Е鍙�
@@ -2949,7 +3025,7 @@
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckClassID": data[i]["HQCCheckClassID"], "妫�楠岄」鐩被鍒�": data[i].妫�楠岄」鐩垎绫�,"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["鐘舵��"],
+ "HQCCheckClassID": data[i]["HQCCheckClassID"], "妫�楠岄」鐩被鍒�": data[i].妫�楠岄」鐩垎绫�,"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
--
Gitblit v1.9.1