From 1934cfa6c93a18d9d840f81e1c79e78dc3313e3b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 八月 2022 18:15:54 +0800
Subject: [PATCH] 维护
---
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html | 2 +
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html | 3 +
WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html | 52 ++++++++++++++++++++++++-
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 2
WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html | 9 ++++
WebTM/layuiadmin/Scripts/webConfig.js | 4 +-
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 2
WebTM/views/index.html | 6 +-
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 2
9 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ced9ad9..e7c8fe3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,9 +8,9 @@
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
- var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
+ //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 11b0f74..897d57c 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -785,8 +785,8 @@
</dd>
</dl>
</li>
- <!-- 鍙鍖栫湅鏉� -->
- <!--<li data-name="template" class="layui-nav-item">
+ <!--鍙鍖栫湅鏉�-->
+ <li data-name="template" class="layui-nav-item">
<a href="javascript:;" lay-tips="鍙鍖栫湅鏉�" lay-direction="2">
<i class="layui-icon layui-icon-chart-screen"></i>
<cite>鍙鍖栫湅鏉�</cite>
@@ -878,7 +878,7 @@
</a>
</dd>
</dl>
- </li>-->
+ </li>
<!--鍩虹寤烘ā-->
<li data-name="set" class="layui-nav-item">
<a><i class="layui-icon layui-icon-set"></i><cite>鍩虹寤烘ā</cite></a>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
index f25d22d..9e1d99b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
@@ -2417,6 +2417,15 @@
//淇濆瓨
form.on('submit(Saver)', function (data) {
//debugger;
+ if (data.field["HBadQty"] == "") {
+ data.field["HBadQty"] = 0;
+ }
+ if (data.field["HPlanQty"] == "") {
+ data.field["HPlanQty"] = 0;
+ }
+ if (data.field["HMainSourceBillNo"] == "") {
+ return layer.msg("璇烽�夋嫨宸ュ簭璁″垝");
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
index 13a37cb..ee3fa44 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
@@ -357,7 +357,9 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //$('#Ckfl').removeClass("layui-btn-disabled").attr("disabled", true); //鎸夐挳绂佺敤
layer.msg(data.Message, { icon: 1 });
+ Pub_Close(1);
}
else {
layer.alert(data.Message, { icon: 5 });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
index 49e18f0..d95ea12 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -426,6 +426,9 @@
, shift: 2//寮瑰嚭鍔ㄧ敾
, maxmin: true
, content: "../../鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsBill.html?hmainid=" + hmainid
+ ,end: function () {
+ get_FastQuery();
+ }
})
}
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
index dba0f41..ec12fc3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
@@ -19,9 +19,9 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">榻愭枡</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">缂烘枡</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">鎾ら攢</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UniformMater" id="UniformMater">榻愭枡</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="LackMater" id="LackMater">缂烘枡</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Revoke" id="Revoke">鎾ら攢</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
@@ -126,6 +126,21 @@
get_FastQuery();
});
//#endregion
+
+ //榻愭枡
+ form.on('submit(UniformMater)', function (data) {
+ btnMaterOperation(1);
+ });
+
+ //缂烘枡
+ form.on('submit(LackMater)', function (data) {
+ btnMaterOperation(2);
+ });
+
+ //鎾ら攢
+ form.on('submit(Revoke)', function (data) {
+ btnMaterOperation(0);
+ });
//#endregion
@@ -305,6 +320,37 @@
})
}
+
+ //榻愭枡 缂烘枡 鎾ら攢
+ function btnMaterOperation(staus) {
+ var check = table.checkStatus("mainTable");
+
+ if (check.data.length == 0) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ else {
+ var HSourceID = check.data[0]["HSourceID"];
+ var HICMOInterID = check.data[0]["HICMOInterID"];
+ var HDate = check.data[0]["鏃ユ湡"];
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_ICMOSortBill/JIT_ICMOSortBillCheck',
+ type: "GET",
+ data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HDate": HDate, "HStatus": staus, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message);
+ get_FastQuery();
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 6737065..443ae33 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -409,7 +409,7 @@
layer.close(ajaxLoad);
}
});
- if (HSouceBillType == 3722) {
+ if (HSouceBillType == 3722 || HSouceBillType == 4610) {
$("#HSourceBillType").val(HSouceBillType);
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
GetICMOBillValue(linterid);
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 48f5a46..afe3d87 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"
@@ -406,7 +406,7 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- if (HSouceBillType == 3722) {
+ if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
} else if (HSouceBillType == 3791) {
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 f60cf07..f3f2919 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"
@@ -381,7 +381,7 @@
}
});
//鎶ュ伐骞冲彴棣栨
- if (HSouceBillType == 3722) {
+ if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
}
--
Gitblit v1.9.1