From c4b152ab383336ba63a554aaf27e5120c0761b5a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 十二月 2024 16:54:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 55 +++
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 296 ++++++++++++++++++++++
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 78 +++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 49 +++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 37 ++
WebTM/views/IpadIndex.html | 39 ++
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 11
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 46 +++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 61 ++++
WebTM/layuiadmin/layui/css/ReportPlatform.css | 20 +
WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html | 32 +-
12 files changed, 670 insertions(+), 56 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1daf955..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<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>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index 1230db7..ed1e8a9 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -108,26 +108,36 @@
.layui-show {
padding: 5px 10px;
}
-
+/*榛勮壊*/
.color_border1 {
border: 0.4em solid #ffd800;
background-color: #ffd800;
}
-
+/*钃濊壊*/
.color_border2 {
border: 0.4em solid #09d1ea;
background-color: #09d1ea;
}
-
-.color_border3 {
+/*鐏拌壊*/
+.color_border3 {
border: 0.4em solid #808080;
background-color: #808080;
}
+/*缁胯壊*/
.color_border4 {
border: 0.4em solid #13ad4c;
background-color: #13ad4c;
}
-
+/*绾㈣壊*/
+.color_border5 {
+ border: 0.4em solid #E74C3C;
+ background-color: #E74C3C;
+}
+/*娴呯豢鑹�*/
+.color_border6 {
+ border: 0.4em solid #B0C4DE;
+ background-color: #B0C4DE;
+}
.gj_icon {
border-radius: 0.4em;
width: 1px;
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index a996612..d05528c 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -101,8 +101,32 @@
html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
//html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
//html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
- //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
+ //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
+ switch (LoadData[i - 1].HStatus) {
+ case "绌洪棽":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "寮�鏈�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鍋滄満":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "鐢熶骇":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨杩涜涓�":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁撴潫":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ case "缁翠慨缁堟":
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
+ break;
+ default:
+ }
html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
html1 += '</dd>';
@@ -233,8 +257,7 @@
break;
case "瀹屽伐":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
- break;
- default:
+ break;
}
html1 += '<span class="prs">鐢熶骇杩涘害锛�</span>';
html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
@@ -1489,16 +1512,16 @@
<span class="imgtitle">棣栨</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">宸℃</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
- <div class="cnt bottomright">
+ <div class="layui-col-sm12 layui-col-md4">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
<span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">杩囩▼妫�楠�</span>
+ <span class="imgtitle">鏈</span>
</div>
</div>
</div>
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].鎷掔粷鏁�,
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index cc9ce71..8a0a60f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -725,6 +725,10 @@
//var linterid = 11880;
//var HSouceBillType = 3722;
//var HICMOEntryID = 100027;
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//#region 鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
@@ -775,26 +779,36 @@
if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationInBill();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3793) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation3();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//鐢熶骇璁㈠崟鍒楄〃棣栨
else if (HSouceBillType == 3710) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ICMO();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -807,8 +821,7 @@
$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//#region 鏍规嵁婧愬崟鑾峰彇淇℃伅
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(杩涚珯鎺ユ敹鍗�)
function LoadingInformation_StationInBill() {
@@ -816,6 +829,7 @@
$.ajax({
url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_StationInBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -858,6 +872,7 @@
$.ajax({
url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -903,6 +918,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
type: "GET",
+ async: false,
data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -935,6 +951,7 @@
$.ajax({
url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/get_ICMOBillStatus_Tmp",
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
var data = result.data[0];
@@ -976,6 +993,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
type: "GET",
+ async: false,
data: { "sWhere": "and HInterID = " + linterid },
success: function (result) {
var data = result.data[0];
@@ -1405,6 +1423,8 @@
});
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 //寰楀埌淇敼鍚庣殑鍊�
@@ -1413,7 +1433,7 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
//var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
//var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val() - 1;
+ var HEntryID = rowIndex;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
@@ -1911,7 +1931,7 @@
//#endregion
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
- window.get_CheckItem = function () {
+ function get_CheckItem() {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2120,6 +2140,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2160,6 +2181,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2238,6 +2260,7 @@
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -3847,6 +3870,29 @@
}
//#endregion
+ //鑷姩甯﹀嚭妫�楠岄」鐩�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -3872,6 +3918,7 @@
$("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);
$("#HMaterID").val(obj.HItemID);
+ GetCheckItemID();
}
function GetHEmpValue(obj) { //璐ㄦ鍛�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 6e3afd5..fd10784 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -772,6 +772,10 @@
//var HSouceBillType = 3722;
////var HICMOEntryID = 100027;
//var HICMOEntryID = "";
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
@@ -827,14 +831,20 @@
if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
} else if (HSouceBillType == 3791) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationOutBill();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭娴佽浆鍗″垪琛ㄥ伐搴忔
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -847,9 +857,7 @@
}
$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
-
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
function LoadingInformation2() {
@@ -857,6 +865,7 @@
$.ajax({
url: GetWEBURL() + "/QC_ProcessCheckBill/get_ICMOBillStatus_Tmp",
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
if (result.code == 1) {
@@ -901,6 +910,7 @@
$.ajax({
url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -942,6 +952,7 @@
$.ajax({
url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -1308,6 +1319,8 @@
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 //寰楀埌淇敼鍚庣殑鍊�
@@ -1316,7 +1329,7 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
//var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
//var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val() - 1;
+ var HEntryID = rowIndex;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
@@ -1924,7 +1937,7 @@
});
//#endregion
- window.get_CheckItem = function() {
+ function get_CheckItem() {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2136,6 +2149,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2176,6 +2190,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2213,6 +2228,7 @@
}
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -3835,6 +3851,28 @@
}
//#endregion
+ //鑷姩甯﹀嚭妫�楠岄」鐩�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
//浠ヤ笂涓簂ayui妯″潡
});
@@ -3868,6 +3906,7 @@
$("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(obj[0].HItemID);
+ GetCheckItemID();
}
function GetHEmpValue(obj) { //璐ㄦ鍛�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 026afe1..5e2b479 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -727,9 +727,17 @@
let HDifference = [];//宸��
let HSJZ = [];//瀹為檯鍊�
+ var judge = spc_judge();
+
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
- HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ if ($.inArray(optionAVG[0][option.cols[0][j].field], judge) != -1) {
+ var data = { value: optionAVG[0][option.cols[0][j].field], itemStyle: { color: 'red' } };
+ HAvg.push(data);
+ } else {
+ HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ }
+
HDifference.push(optionS[0][option.cols[0][j].field]);
HSJZ.push(optionSJZ[0][option.cols[0][j].field]);
} else {
@@ -750,6 +758,10 @@
sum += value;
});
var average = sum / HSJZ.length;
+
+ var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
+ var HAreaValue_A = HAreaValue * 2;
+ var HAreaValue_B = HAreaValue * 1;
option_ZXT_Avg = {
title: {
@@ -776,8 +788,13 @@
{
data: HAvg,
type: 'line',
-
- itemStyle: { normal: { label: { show: true } } },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true
+ }
+ }
+ },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
@@ -788,14 +805,30 @@
name: 'LSL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
},
{
- name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#ff9145' }, label: { color: '#ff9145', fontSize: 10 }, label: { formatter: '{b}: {c}' }
},
{
- name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#ff9145' }, label: { color: '#ff9145', fontSize: 10 }, label: { formatter: '{b}: {c}' }
}
,
{
- name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#000000' }, label: { color: '#000000', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: 'B', yAxis: parseFloat($("#HCenterline_X").val()) + HAreaValue_A, lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: '-B', yAxis: parseFloat($("#HCenterline_X").val()) - HAreaValue_A, lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: 'C', yAxis: parseFloat($("#HCenterline_X").val()) + HAreaValue_B, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: '-C', yAxis: parseFloat($("#HCenterline_X").val()) - HAreaValue_B, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
}
],
precision: 3
@@ -888,7 +921,14 @@
{
data: HSJZ,
type: 'line',
- itemStyle: { normal: { label: { show: true } } },
+ itemStyle: {
+ normal:
+ {
+ label: {
+ show: true
+ }
+ }
+ },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
@@ -918,6 +958,248 @@
}
+ //璁＄畻spc鍏ぇ鍒ゅ畾
+ function spc_judge() {
+ //鍧囧��
+ var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
+ //涓婇檺閮ㄥ垎
+ var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());
+ var HAreaValue_B = calc(calc(HAreaValue, 2, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
+ var HAreaValue_C = calc(calc(HAreaValue, 1, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
+ //涓嬮檺閮ㄥ垎
+ var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());
+ var HAreaValue_FB = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 2, "*"), "-").toFixed(5);
+ var HAreaValue_FC = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 1, "*"), "-").toFixed(5);
+
+
+ let HAvg = [];//骞冲潎鍊�
+
+ for (var j = 1; j < option.cols[0].length; j++) {
+ if (optionAVG.length != 0) {
+ HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ }
+ }
+
+ //杩炵画鍗佷簲涓偣鍦ㄤ腑蹇冪嚎涓や晶鐨凜鍖哄唴
+ var judge_return = [];
+ if (HAvg.length >= 15) {
+ for (var i = 14; i < HAvg.length; i++) {
+ if (HAvg[i] >= HAreaValue_FC && HAvg[i] <= HAreaValue_C) {
+ for (var j = i - 14; j <= i; j++) {
+ if (HAvg[j] >= HAreaValue_FC && HAvg[j] <= HAreaValue_C) {
+ if (i == j) {
+ for (var j1 = i; j1 >= i - 14; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ }
+ //杩炵画14涓偣涓浉閭荤偣浜ゆ浛涓婁笅
+ if (HAvg.length >= 14) {
+ for (var i = 13; i < HAvg.length; i++) {
+ var judge = [];
+ for (var j = i - 13; j < i; j++) {
+ if (HAvg[j] > HAvg[j + 1]) {
+ judge.push(1);
+ } else if (HAvg[j] < HAvg[j + 1]) {
+ judge.push(-1);
+ }
+ }
+ for (var k = 0; k < judge.length; k++) {
+ if (judge[k] + judge[k + 1] == 0) {
+ if ((k + 1) == judge.length) {
+ for (var j1 = i; j1 >= i - 13; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+
+ //杩炵画9涓偣钀藉湪涓績绾跨殑鍚屼竴渚�
+ if (HAvg.length >= 9) {
+ for (var i = 8; i < HAvg.length; i++) {
+ var judge = [];
+ for (var j = i - 8; j <= i; j++) {
+ if (HAvg[j] > parseFloat($("#HCenterline_X").val())) {
+ judge.push(1);
+ } else if (HAvg[j] < parseFloat($("#HCenterline_X").val())) {
+ judge.push(-1);
+ }
+ }
+ var sum = 0;
+ for (var k = 0; k < judge.length; k++) {
+ sum += judge[k];
+ }
+ if (sum == 9 || sum == -9) {
+ for (var j1 = i; j1 >= i - 8; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+
+ //杩炵画8鐐硅惤鍦ㄤ腑蹇冪嚎涓や晶涓旀棤涓�鍦–鍖轰互鍐�(鍗冲湪C鍖轰互澶�)
+ if (HAvg.length >= 8) {
+ for (var i = 7; i < HAvg.length; i++) {
+ if (HAvg[i] < HAreaValue_FC || HAvg[i] > HAreaValue_C) {
+ for (var j = i - 7; j <= i; j++) {
+ if (HAvg[j] < HAreaValue_FC || HAvg[j] > HAreaValue_C) {
+ if (j == i) {
+ for (var j1 = i; j1 >= i - 7; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ //杩炵画6鐐归�掑鎴栭�掑噺
+ if (HAvg.length >= 6) {
+ for (var i = 5; i < HAvg.length; i++) {
+ var judge = [];
+ for (var j = i - 5; j < i; j++) {
+ if (HAvg[j] > HAvg[j + 1]) {
+ judge.push(1);
+ } else if (HAvg[j] < HAvg[j + 1]) {
+ judge.push(-1);
+ }
+ }
+ var sum = 0;
+ for (var k = 0; k < judge.length; k++) {
+ sum += judge[k];
+ }
+ if (sum == 5 || sum == -5) {
+ for (var j1 = i; j1 >= i - 5; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+
+ //杩炵画5鐐逛腑鏈�4鐐硅惤鍦ㄤ腑蹇冪嚎鍚屼竴渚х殑C鍖哄
+ if (HAvg.length >= 5) {
+ for (var i = 4; i < HAvg.length; i++) {
+ var judge = [];
+ if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_C) {
+ for (var j = i - 4; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_C) {
+ record.push(HAvg[j]);
+ if (record.length >= 4) {
+ for (var j1 = i; j1 >= i - 4; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+
+ }
+ }
+ else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FC) {
+ for (var j = i - 4; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FC) {
+ record.push(HAvg[j]);
+ if (record.length >= 4) {
+ for (var j1 = i; j1 >= i - 4; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+
+ //杩炵画3鐐逛腑鏈�2鐐硅惤鍦ㄤ腑蹇冪嚎鍚屼竴渚х殑B鍖哄
+ if (HAvg.length >= 3) {
+ for (var i = 2; i < HAvg.length; i++) {
+ var judge = [];
+ if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_B) {
+ for (var j = i - 2; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_B) {
+ record.push(HAvg[j]);
+ if (record.length >= 2) {
+ for (var j1 = i; j1 >= i - 2; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+
+ }
+ }
+ else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FB) {
+ for (var j = i - 2; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FB) {
+ record.push(HAvg[j]);
+ if (record.length >= 2) {
+ for (var j1 = i; j1 >= i - 2; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+
+ //1涓偣钀藉湪A鍖轰互澶�
+ if (HAvg.length >= 0) {
+ for (var i = 0; i < HAvg.length; i++) {
+ var judge = [];
+ if (HAvg[i] > HAreaValue_A) {
+ if ($.inArray(HAvg[i], judge_return) == -1) {
+ judge_return.push(HAvg[i]);
+ }
+ }
+ else if (HAvg[i] < HAreaValue_FA) {
+ if ($.inArray(HAvg[i], judge_return) == -1) {
+ judge_return.push(HAvg[i]);
+ }
+ }
+ }
+ }
+
+ return judge_return;
+
+ }
+
//鐢熶骇杞﹂棿
function get_Dept() {
//鑾峰彇杞﹂棿鍒�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index 89b4712..c140d70 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -712,6 +712,10 @@
//var linterid = 11880;
//var HSouceBillType = 3722;
//var HICMOEntryID = 100027;
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//#region 鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
@@ -762,26 +766,36 @@
if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationInBill();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3793) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation3();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//鐢熶骇璁㈠崟鍒楄〃棣栨
else if (HSouceBillType == 3710) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ICMO();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -803,6 +817,7 @@
$.ajax({
url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_StationInBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -844,6 +859,7 @@
$.ajax({
url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_ProcessExchangeBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -888,6 +904,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
type: "GET",
+ async: false,
data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -920,6 +937,7 @@
$.ajax({
url: GetWEBURL() + "/QC_WorkSelfCheckBill/get_ICMOBillStatus_Tmp",
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
var data = result.data[0];
@@ -961,6 +979,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
type: "GET",
+ async: false,
data: { "sWhere": "and HInterID = " + linterid },
success: function (result) {
var data = result.data[0];
@@ -1066,6 +1085,7 @@
$("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2116,6 +2136,7 @@
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
get_ICMOBillStatusList();
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -2194,6 +2215,7 @@
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -3769,6 +3791,29 @@
}
//#endregion
+ //鑷姩甯﹀嚭妫�楠岄」鐩�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -3794,6 +3839,7 @@
$("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);
$("#HMaterID").val(obj.HItemID);
+ GetCheckItemID();
}
function GetHEmpValue(obj) { //璐ㄦ鍛�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 1871224..9942b86 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -727,7 +727,7 @@
var SampleNum = [];//鏍锋湰鏁伴噺
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
- var HModuleType = "7504";
+ var HModuleType = "7505";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
@@ -749,6 +749,10 @@
//var linterid = 11880;
//var HSouceBillType = 3722;
//var HICMOEntryID = 100027;
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//#region 鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
@@ -800,30 +804,40 @@
if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationInBill();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3793) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation3();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//鐢熶骇璁㈠崟鍒楄〃棣栨
else if (HSouceBillType == 3710) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ICMO();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
- }
+ }
}
else if (OperationType == 3) {
RoadBillMain(linterid);
@@ -833,8 +847,7 @@
$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//#region 鏍规嵁婧愬崟鑾峰彇淇℃伅
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(杩涚珯鎺ユ敹鍗�)
function LoadingInformation_StationInBill() {
@@ -842,6 +855,7 @@
$.ajax({
url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -885,6 +899,7 @@
$.ajax({
url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -930,6 +945,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
type: "GET",
+ async: false,
data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -966,6 +982,7 @@
$.ajax({
url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
type: "GET",
+ async:false,
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
var data = result.data[0];
@@ -1006,6 +1023,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
type: "GET",
+ async: false,
data: { "sWhere": "and HInterID = " + linterid },
success: function (result) {
var data = result.data[0];
@@ -1961,11 +1979,12 @@
//#endregion
//#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
- window.get_CheckItem = function () {
+ function get_CheckItem() {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
+ async: false,
data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
success: function (result) {
if (result.code == 1) {
@@ -2168,6 +2187,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2208,6 +2228,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2286,6 +2307,7 @@
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -3924,6 +3946,8 @@
//#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 //寰楀埌淇敼鍚庣殑鍊�
@@ -3932,7 +3956,7 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val()-1;
+ var HEntryID = rowIndex;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
@@ -3996,6 +4020,30 @@
}
//#endregion
+ //鑷姩甯﹀嚭妫�楠岄」鐩�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -4021,6 +4069,7 @@
$("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(obj[0].HItemID);
+ GetCheckItemID();
}
function GetHEmpValue(obj) { //璐ㄦ鍛�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 681800d..0b9792f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -206,7 +206,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">绌村彿</label>
<div class="layui-input-block" style="margin-left: 95px; width: 150px">
- <select name="HMouldNum" id="HMouldNum" lay-verify="required" lay-search class="layui-input" >
+ <select name="HMouldNum" id="HMouldNum" lay-verify="required" lay-search class="layui-input">
<option value="0#" selected>0#</option>
<option value="1#">1#</option>
<option value="2#">2#</option>
@@ -295,9 +295,17 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">璁惧宸ユ椂</label>
<div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input" name="HMachineWorkTimes" id="HMachineWorkTimes" value="0" style="width: 150px;" >
+ <input type="text" class="layui-input" name="HMachineWorkTimes" id="HMachineWorkTimes" value="0" style="width: 150px;">
</div>
</div>
+ </div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鎶曞叆鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HTRQty" id="HTRQty" value="" style="width: 150px;" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1202,7 +1210,9 @@
return false;
}
var HBadCount = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0);
+ var HTRQty = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0); //鎶曞叆鏁伴噺
$("#HBadCount").val(HBadCount);
+ $("#HTRQty").val(HTRQty);
});
//#region 鏂欏簾鎶樻墸澶辩劍浜嬩欢
@@ -1222,7 +1232,30 @@
}
var HBadCount = (parseFloat(newHWasterQty_Mater) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0); //涓嶈壇鏁伴噺
+ var HTRQty = (parseFloat(newHWasterQty_Mater) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0); //鎶曞叆鏁伴噺
$("#HBadCount").val(HBadCount);
+ $("#HTRQty").val(HTRQty);
+
+ });
+ //#endregion
+
+ //#region 鍚堟牸鏁版姌鎵ｅけ鐒︿簨浠�
+ var oldHQty = ""; //淇敼鍓嶇殑鍊�
+ var newHQty = ""; //淇敼鍚庣殑鍊�
+ $("#HQty").on('focus', function (data) {
+ oldHQty = $("#HQty").val(); //鏂欏簾鏂囨湰妗嗚幏鍙栫劍鐐规椂鑾峰彇淇敼鍓嶇殑鍊�
+ }).on('blur', function (data) {
+ newHQty = $("#HQty").val(); //鏂欏簾鏂囨湰妗嗗け鐒︽椂鑾峰彇淇敼鍚庣殑鍊�
+
+ //鍒ゆ柇杈撳叆鐨勬枡搴熸槸鍚﹀悎娉�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ if (!ref.test(newHQty)) {
+ layer.msg("鏂欏簾璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ $("#HQty").val(oldHQty);
+ return false;
+ }
+ var HTRQty = (parseFloat(newHQty) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0); //鎶曞叆鏁伴噺
+ $("#HTRQty").val(HTRQty);
});
//#endregion
--
Gitblit v1.9.1