From 98985ecc072e420eb93628bd0f9ff1d81ee6a90b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 12 十二月 2024 13:20:34 +0800
Subject: [PATCH] 1.报工台： 增加 设备状态2.当前工单汇报:增加一个 投入数量=合格数量+工废数量+料废数量，数据库不增加字段 3.首件 巡检 等 ； 根据物料＋工序 默认带入；4.定性的 默认合格； 定量的 输入 检验值 自动带出合格不合格
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 51 +++++++++
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 45 ++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 37 +++++++
WebTM/views/IpadIndex.html | 29 +++++
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 46 +++++++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 57 ++++++++++-
WebTM/layuiadmin/layui/css/ReportPlatform.css | 20 +++-
8 files changed, 264 insertions(+), 23 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8233a56..8f1260e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
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..4e00d63 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">';
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..3c22613 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];
@@ -1911,7 +1929,7 @@
//#endregion
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
- window.get_CheckItem = function () {
+ function get_CheckItem() {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2120,6 +2138,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2160,6 +2179,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2238,6 +2258,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 +3868,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 +3916,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..c0f7033 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];
@@ -1924,7 +1935,7 @@
});
//#endregion
- window.get_CheckItem = function() {
+ function get_CheckItem() {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2136,6 +2147,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2176,6 +2188,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_ICMOBillStatusList();
get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -2213,6 +2226,7 @@
}
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -3835,6 +3849,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 +3904,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\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..1840ce3 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) {
@@ -3996,6 +4018,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 +4067,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