From 9dffd2ef1aa4ec4f4dc23206e533c6f596b4f73d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 18 七月 2024 17:20:26 +0800
Subject: [PATCH] 工艺路线增加多选返回,车间自检单增加工序流转卡下推获取源单数据
---
WebTM/WebTM.csproj.user | 4
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 54 ++++++++++++++---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 32 ++++++++++
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html | 8 +-
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 40 ++++++------
5 files changed, 102 insertions(+), 36 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 5978c26..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-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/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
index 97d2433..e8f9bf0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
@@ -42,7 +42,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline "style="display:none">
<label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績</label>
<div class="layui-input-block" style="margin-left: 120px; width: 120px;">
<select name="HWorkCenter" id="HWorkCenter" lay-verify="HWorkCenter">
@@ -227,10 +227,10 @@
type: 'value',
name: '瓒嬪娍鐜�%',
min: 0,
- max: 100,
- interval: 10,
+ max: 1,
+ interval: 0.1,
axisLabel: {
- formatter: '{value} ' + '%'
+ formatter: '{value} '
}
}
],
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index f4348f5..0828e60 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -205,7 +205,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;">
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -559,10 +559,10 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HTechParamID": "",
+ "HTechParamID": 0,
"HTechParamNumber": "",
"HTechParamName": "",
- "HTechParamUnitID": "",
+ "HTechParamUnitID": 0,
"HTechParamUnitName": "",
"HStd": "0",
"HMax": "0",
@@ -911,11 +911,10 @@
if (event.key == "F7") {
//宸ヨ壓鍙傛暟
if (obj.event == "HTechParamNumber") {
- //鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '妯″叿鍒楄〃',
+ title: '宸ヨ壓鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -929,12 +928,47 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- obj.update({
- "HTechParamID": checkStatus.data[0].HItemID,
- "HTechParamNumber": checkStatus.data[0].宸ヨ壓鍙傛暟浠ｇ爜,
- "HTechParamName": checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О,
- });
+ table.cache["mainTable"].splice(0, 1);
+ for (var rowData of checkStatus.data) {
+ var NewRow = {
+ "HTechParamID": rowData.HItemID,
+ "HTechParamNumber": rowData.宸ヨ壓鍙傛暟浠ｇ爜,
+ "HTechParamName": rowData.宸ヨ壓鍙傛暟鍚嶇О,
+ "HTechParamUnitID": 0,
+ "HTechParamUnitName": "",
+ "HStd": "0",
+ "HMax": "0",
+ "HMin": "0",
+ "HDataForm": "鎵嬪伐褰曞叆",
+ "HDataUnit": "绉�",
+ "HDataTimes": "0",
+ "HSourceBillNo": "0",
+ "HSourceBillType": "0",
+ "HSourceEntryID": "0",
+ "HSourceInterID": "0"
+ };
+ table.cache["mainTable"].push(NewRow);
+ }
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ //for (var i = 0; i < checkStatus.data.length; i++) {
+ // option.data.push({
+ // "HTechParamID": checkStatus.data[i].HItemID,
+ // "HTechParamNumber": checkStatus.data[i].宸ヨ壓鍙傛暟浠ｇ爜,
+ // "HTechParamName": checkStatus.data[i].宸ヨ壓鍙傛暟鍚嶇О,
+ // })
+ //}
+
+
+ //obj.update({
+ // "HTechParamID": checkStatus.data[0].HItemID,
+ // "HTechParamNumber": checkStatus.data[0].宸ヨ壓鍙傛暟浠ｇ爜,
+ // "HTechParamName": checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О,
+
+ //});
+ //table.render(option);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, end: function () {
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 25bf4a3..01f9935 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"
@@ -352,13 +352,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍锋湰閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍锋湰鐮村潖鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" style="">
+ <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
</div>
</div>
</div>
@@ -401,7 +401,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎷掔粷鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<!--<div class="layui-inline">
@@ -996,8 +996,8 @@
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
+ "HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
};
switch (obj.event) {
@@ -1484,19 +1484,19 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡
, "HUpDateDate": data.淇敼鏃ユ湡
, "HDeleteDate": data.浣滃簾鏃ユ湡
- , "HSampleSchemeID": data.HSampleSchemeID
+ , "HSampleSchemeID": data.HSampleSchemeID == '' ? 0 : data.HSampleSchemeID
, "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
, "HSampleQty": data.鏍锋湰閲�
, "HSampleQty2": data.鏍锋湰閲�
- , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁�
+ , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁� == '' ? 0 : data.HSampleDamageQty
, "HSamplingType": data.鎶芥牱绫诲瀷
, "HAcceptQty": data.鍏佽鏁�
, "HInspectResultToSee2":data.妫�楠岀粨鏋�
, "HInspectionLevel": data.妫�楠屾按骞�
- , "HRejectQty": data.鎷掔粷鏁�
+ , "HRejectQty": data.鎷掔粷鏁� == '' ? 0 : data.鎷掔粷鏁�
, "HStrictness": data.涓ユ牸搴�
- , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟
- , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟 == '' ? 0 : data.鏍锋湰涓嶅悎鏍兼暟
+ , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟 == '' ? 0 : data.鏍锋湰涓嶅悎鏍兼暟
, "HAQL": data.AQL
, "HEntryID": data.hsubid
, "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
@@ -1841,7 +1841,7 @@
rowdata.push(
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": 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"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
@@ -2181,7 +2181,7 @@
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
"HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
}];
option = {
@@ -2621,21 +2621,21 @@
$("#HDownLimit").val(0);
$("#HUpOffSet").val(0);
$("#HDownOffSet").val(0);
- $("#HSampleDamageQty").val("")
- $("#HSampleQty").val("")
- $("#HSampleQty2").val("")
+ $("#HSampleDamageQty").val("0")
+ $("#HSampleQty").val("0")
+ $("#HSampleQty2").val("0")
$("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
- $("#HRejectQty").val("")
+ $("#HRejectQty").val("0")
$("#HStrictness").val("")
- $("#HSampleUnRightQty").val("")
- $("#HSampleUnRightQty2").val("")
+ $("#HSampleUnRightQty").val("0")
+ $("#HSampleUnRightQty2").val("0")
$("#HAQL").val("")
$("#HSamplingType").val("")
- $("#HSampleQty").val("")
+ $("#HSampleQty").val("0")
$("#HInspectResultToSee").val("")
$("#HInspectResultToSee2").val("")
- $("#HSampleUnRightQty").val("")
+ $("#HSampleUnRightQty").val("0")
$("#HUnitID").val("0")
$("#HUnitName").val("")
$("#HInspectValB").val("0")
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index fcd9873..6e29281 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -266,6 +266,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>棣栨</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>宸ュ簭妫�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_PatrolCheck" id="set_PatrolCheck"><i class="layui-icon layui-icon-form"></i>宸℃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_WorkCheck" id="set_WorkCheck"><i class="layui-icon layui-icon-form"></i>鑷</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
@@ -486,6 +487,9 @@
break;
//宸℃
case 'set_PatrolCheck': set_PatrolCheck();
+ break;
+ //鑷
+ case 'set_WorkCheck': set_WorkCheck();
break;
};
});
@@ -2838,6 +2842,34 @@
}
}
+ //杞﹂棿鑷
+ function set_WorkCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '杞﹂棿鑷鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/杞﹂棿鑷鍗�/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//鐢熶骇璐ㄩ噺姹囨姤鍗�
function set_ProcessExchange() {
var checkStatus = table.checkStatus('mainTable2')
--
Gitblit v1.9.1