From 1a83f7eea922c47680ad6bc91c911e239072aac2 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 17 七月 2024 10:36:28 +0800
Subject: [PATCH] 流转卡下推设备工艺参数点检获取数据,修复休息日出现重复数据不能保存
---
WebTM/views/基础资料/公用基础资料/Gy_RestDay.html | 2
WebTM/WebTM.csproj.user | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 1
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 80 ++++++++++++++++++++++++--
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 81 +++++++++++++++++++++++++++
5 files changed, 156 insertions(+), 10 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<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/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RestDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RestDay.html"
index 01c49c8..8dcd0f4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RestDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RestDay.html"
@@ -77,7 +77,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-SumAdd" id="SumAddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-SumAdd" id="SumAddButton"><i class="layui-icon layui-icon-file-b"></i>鎵归噺鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
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 39c9b8d..88568d1 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"
@@ -627,6 +627,7 @@
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', edit: 'text', event: "HTechParamUnitName" } //f7
, { field: 'HStd', title: '鏍囧噯鍊�', edit: 'text', totalRow: true }
, { field: 'HMax', title: '涓婇檺', edit: 'text', totalRow: true }
+ , { field: 'HMin', title: '涓嬮檺', edit: 'text', totalRow: true }
, { field: 'HDataForm', title: '閲囬泦鏉ユ簮', templet: '#HDataForm-select' }
, { field: 'HDataUnit', title: '閲囬泦鏃堕棿鍗曚綅', templet: '#HDataUnit-select' }
, { field: 'HDataTimes', title: '閲囬泦鍛ㄦ湡棰戠巼', edit: 'text', totalRow: true }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index c7bd378..261c335 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -93,6 +93,7 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟鍗曞彿</label>
<div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="0" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -348,6 +349,7 @@
var params = get_UrlVars();
var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
var HInterID = params[params[0]] == null ? 0 : params[params[1]]; //鍗曟嵁鍐呯爜
+ var HEntry = params[params[0]] == null ? 0 : params[params[2]]; //鍗曟嵁瀛愬唴鐮�
//#endregion
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -402,6 +404,8 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(HMaker);
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ //宸ュ簭娴佽浆鍗￠〉闈笅鎺�
+ set_ProcessBill(HInterID, HEntry);
}
else if (OperationType == 2) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
@@ -1302,6 +1306,83 @@
//#endregion
+ //#region (宸ュ簭娴佽浆鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function set_ProcessBill(HInterID, HEntry) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/MES_IF_EquipICMOTechParamList_Json",
+ type: "GET",
+ async: false,
+ data: { "hinterid": HInterID, "HEntryID": HEntry, "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ var result = d;
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMaterID": data.HMaterID,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterName": data.浜у搧鍚嶇О,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HProcID": data.HProcID,
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.宸ュ簭鍙�,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.鐝粍,
+ "HDeptID": data.HDeptID,
+ "HDeptName": data.鍔犲伐杞﹂棿,
+
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮,
+
+ "HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.HEntryID,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+
+
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.HEntryID,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
+ });
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HTechParamID": result.data[i]["HTechParamID"],
+ "HTechParamNumber": result.data[i]["宸ヨ壓鍙傛暟浠ｇ爜"],
+ "HTechParamName": result.data[i]["宸ヨ壓鍙傛暟鍚嶇О"],
+ "HTechParamUnitID": result.data[i]["HTechParamUnitID"],
+ "HTechParamUnitNumber": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜"],
+ "HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"],
+ "HVaule": result.data[i]["鏍囧噯鍊�"],
+ "HStd": result.data[i]["鏍囧噯鍊�"],
+ "HMax": result.data[i]["涓婇檺鍊�"],
+ "HMin": result.data[i]["涓嬮檺鍊�"],
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
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 24b8b10..357bfc3 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"
@@ -202,7 +202,7 @@
</div>
</div>
</div>
-
+
</div>
</div>
<!--<div class="layui-tab-item layui-show">-->
@@ -286,6 +286,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Jl" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>杩斿伐璁板綍</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_zlzk" lay-event="get_zlzk"><i class="layui-icon layui-icon-file-b"></i>瀛愭祦杞崱</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessExchange" id="set_ProcessExchange"><i class="layui-icon layui-icon-form"></i>涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SB_EquipICMOTechParam" id="set_SB_EquipICMOTechParam"><i class="layui-icon layui-icon-form"></i>涓嬫帹宸ヨ壓鍙傛暟鐐规</button>
</div>
</script>
<script type="text/html" id="toolbarDemo3">
@@ -485,7 +486,7 @@
break;
//宸℃
case 'set_PatrolCheck': set_PatrolCheck();
- break;
+ break;
};
});
@@ -543,6 +544,9 @@
break
//涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�
case 'set_ProcessExchange': set_ProcessExchange();
+ break;
+ //涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�
+ case 'set_SB_EquipICMOTechParam': set_SB_EquipICMOTechParam();
break;
};
});
@@ -1017,7 +1021,7 @@
$("#HDeptName").val(sessionStorage["HDeptID"]);
}
form.render('select');
-
+
}
layer.closeAll("loading");
}
@@ -1297,15 +1301,15 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
, title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
@@ -2777,7 +2781,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
-
+
//宸ュ簭妫�
function set_ProcessCheck() {
var checkStatus = table.checkStatus('mainTable')
@@ -2806,7 +2810,7 @@
}
}
- //宸℃
+ //宸℃
function set_PatrolCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -2834,6 +2838,66 @@
}
}
+ //鐢熶骇璐ㄩ噺姹囨姤鍗�
+ function set_ProcessExchange() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid;
+ var HEntryID = data[0].HEntryID;
+ var HProcID = data[0].HProcID;
+ var OperationType = 5;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璐ㄩ噺姹囨姤鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HEntry=0&HProcNo=' + HProcID + '&HEntryID=' + HEntryID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ }
+
+ //宸ヨ壓鍙傛暟鐐规
+ function set_SB_EquipICMOTechParam() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid;
+ var HEntryID = data[0].HEntryID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璁惧宸ヨ壓鍙傛暟鐐规-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=1&linterid=' + linterid + '&HEntryID=' + HEntryID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ }
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
--
Gitblit v1.9.1