From 4ea4e7d7631d0ebe35adaa4a9cb36b0149962b71 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 23 十月 2024 09:10:40 +0800
Subject: [PATCH] 增加不良采集,生产质量汇报单在选择不良原因时,根据当前工序带出对应不良原因,增加字段HNowProcID int //当前工序,优化启动点检编辑时赋值为空,不良品台账增加过滤条件
---
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 9 deletions(-)
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 8162b1a..f587438 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"
@@ -55,6 +55,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSumSave">鎵归噺淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
<button type="button" id="set_SaveBarCode" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBarCode" style="display:none;">鎵爜淇濆瓨</button>
</div>
@@ -83,11 +84,18 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杞﹂棿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <!--<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">涓嶈壇鏁伴噺</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBadReasonHQty" id="HBadReasonHQty" value="0">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -132,6 +140,13 @@
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline" style="display:none">
+ <label class="layui-form-label">璁￠噺鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUnitName" id="HUnitName" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -382,7 +397,7 @@
//var HSouceBillType = 3722;
get_Display_UserList();
- get_ConfigFileInfo_EquipFile();
+ //get_ConfigFileInfo_EquipFile();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
@@ -397,9 +412,12 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HMaker").val(sessionStorage["HUserName"]);
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HProcID").val(sessionStorage["HProcID"]); //宸ュ簭ID
+ $("#HProcNo").val(sessionStorage["HProcName"]); //宸ュ簭鍚嶇О
+ $("#HSourceID").val(sessionStorage["HSource"]); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(sessionStorage["HSourceID"]); //鐢熶骇璧勬簮鍚嶇О
layer.close(ajaxLoad);
}
});
@@ -417,9 +435,6 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
- $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
layer.close(ajaxLoad);
}
});
@@ -464,6 +479,37 @@
//#region 閫夋嫨妫�楠屽憳鎸夐挳
form.on('submit(get_checkEmp)', function () {
get_checkEmp();
+ });
+ //#endregion
+
+
+ //#region 鎵归噺淇濆瓨鎸夐挳
+ form.on('submit(btnSumSave)', function (data) {
+ var sMainStr = JSON.stringify(data.field);
+ var oMain = sMainStr + ';' + OperationType;
+ var ajaxLoad = layer.load();
+ $("#HBarCode").val("");
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(ajaxLoad);
+ }
+ else {
+ layer.close(ajaxLoad);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(ajaxLoad);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ get_SumSave();
});
//#endregion
@@ -593,7 +639,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"], "HBadReasonHQty": $("HBadReasonHQty").val() },
+ data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"]/*,"HBadReasonHQty": $("#HBadReasonHQty").val()*/ },
success: function (result) {
if (result.count == 1) {
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -643,7 +689,12 @@
$("#HMaterID").val(data.HMaterID);
$("#HMaterModel").val(data.HMaterModel);
$("#HICMOEntryID").val(data.HICMOEntryID);
-
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.HDeptName);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HSourceName").val(data.HSourceName);
+ $("#HUnitID").val(data.HUnitID);
+ $("#HUnitName").val(data.HUnitName);
if (HSouceBillType == "3772") {
$("#HQty").val(data.HDatePlanQty);
$("#HProcExchBillNo").val(data.HSourceBillNo);
@@ -678,6 +729,10 @@
$("#HCheckManName").val(data1.data[0]["璐ㄦ鍛�"]);
$("#HGroupID").val(data1.data[0]["HGroupID"]);
$("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
+ $("#HProcID").val(data1.data[0]["HProcID"]); //宸ュ簭ID
+ $("#HProcNo").val(data1.data[0]["宸ュ簭"]); //宸ュ簭鍚嶇О
+ $("#HSourceID").val(data1.data[0]["HSourceID"]); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]); //鐢熶骇璧勬簮鍚嶇О
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -701,7 +756,7 @@
$("#HSourceID").val(objdata.HSourceID); //鐢熶骇璧勬簮ID
$("#HSourceName").val(objdata.HSourceName); //鐢熶骇璧勬簮鍚嶇О
}
- //#endregion
+ //#endregion
//#region 閫夋嫨鐢熶骇璧勬簮鏂规硶
function get_checkSource() {
@@ -778,6 +833,53 @@
}
//#endregion
+ //#region 鎵归噺淇濆瓨鎸夐挳
+ function get_SumSave() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鎵归噺淇濆瓨',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './Sc_QualityReportBillSumSave.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HInterID": $("#HInterID").val(),
+ "HBillNo": $("#HBillNo").val(),
+ "HMaterID": $("#HMaterID").val(),
+ "HMaterNumber": $("#HMaterNumber").val(),
+ "HMaterName": $("#HMaterName").val(),
+ "HProcID": $("#HProcID").val(),
+ "HProcNo": $("#HProcNo").val(),
+ "HGroupID": $("#HGroupID").val(),
+ "HGroupName": $("#HGroupName").val(),
+ "HSourceID": $("#HSourceID").val(),
+ "HSourceName": $("#HSourceName").val(),
+ "HUnitID": $("#HUnitID").val(),
+ "HUnitName": $("#HUnitName").val(),
+ "HICMOInterID": $("#HICMOInterID").val(),
+ "HICMOEntryID": $("#HICMOEntryID").val(),
+ "HICMOBillNo": $("#HICMOBillNo").val(),
+ "HProcExchInterID": $("#HProcExchInterID").val(),
+ "HProcExchEntryID": $("#HProcExchEntryID").val(),
+ "HProcExchBillNo": $("#HProcExchBillNo").val()
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+ //#endregion
+
//#region 鎵笉鑹潯鐮佸悗璋冪敤鐨勬樉绀烘壂鎻忚褰曟柟娉�
function get_BarCodeDetail() {
var ajaxLoad = layer.load();
--
Gitblit v1.9.1