From e0fa6f63fc5c4148895c6d035e2e3275aaed166a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 19 十一月 2023 12:46:46 +0800
Subject: [PATCH] 优化单品过站
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 32 +++++++
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 56 +++++++++----
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html | 20 ++--
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 6
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 66 +++++++++++----
6 files changed, 128 insertions(+), 54 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 31c6d84..892b2a3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -693,9 +693,9 @@
if (!isNaN(HDeptID) && HDeptName == 0) {
HDeptName = HDeptID;
}
- if (!isNaN(HDeptID)) {
- HStatus = "寮�宸�";
- }
+ //if (!isNaN(HDeptID)) {
+ // HStatus = "寮�宸�";
+ //}
if (HSF) {//鍒ゆ柇鎵撳嵃鐘舵��
if (HSF == "鍏ㄩ儴") {
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/JIT_DayPlanPlatForm.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/JIT_DayPlanPlatForm.html"
index b129f69..f34d79b 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/JIT_DayPlanPlatForm.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/JIT_DayPlanPlatForm.html"
@@ -751,7 +751,7 @@
columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index 5ff26ad..351b414 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -168,6 +168,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="" style="background-color:#efefef4d;">
<input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
+ <input type="hidden" class="layui-input" name="HProdOrgID" lay-verify="HProdOrgID" id="HProdOrgID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -315,10 +316,12 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HProcExchBillNo = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
@@ -455,40 +458,65 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
- var index = layer.load();
+ var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
- async: true,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
+ url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ async: false,
+ data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
- layer.close(index);
- $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
- $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
- $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
- $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
- $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
- $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
- $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
- $("#HMaterID").val(data1.data[0]["HMaterID"]);
- $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
- $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
- $("#HBarCode").val(data1.data[0]["鏉＄爜"]);
-
+ layer.close(indexs);
+ var index = layer.load();
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
+ async: false,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(index);
+ $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
+ $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
+ $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
+ $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
+ $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
+ $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+ $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
+ $("#HMaterID").val(data1.data[0]["HMaterID"]);
+ $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
+ $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
+ $("#HBarCode").val(data1.data[0]["鏉＄爜"]);
+
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
}
else {
- layer.close(index);
+ layer.close(indexs);
layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
$("#HBarCodeSN").val("");
},
error: function (err) {
- layer.close(index);
+ layer.close(indexs);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+
+
}
//涓嶈壇鍘熷洜閫夋嫨椤甸潰
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index 0655584..b7df8e6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -371,12 +371,17 @@
// NG淇濆瓨
form.on('submit(NGSave)', function (data) {
- get_Save(data,"NG");
+ if (AllowLoadData()) {
+ get_Save(data, "NG");
+ }
+
});
// OK淇濆瓨
form.on('submit(OKSave)', function (data) {
- get_Save(data,"OK");
+ if (AllowLoadData()) {
+ get_Save(data, "OK");
+ }
});
//#endregion
@@ -760,6 +765,8 @@
var HSourceBillNo = $("#HSourceBillNo").val();
var HSourceBillType = $("#HSourceBillType").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+ var HProcExchEntryID = $("#HProcExchEntryID").val();
var HProcess = $("#HProcess").val();
var HICMOInterID = $("#HICMOInterID").val();
var HICMOBillNo = $("#HICMOBillNo").val();
@@ -778,6 +785,8 @@
, 'HSourceBillType': HSourceBillType
, 'HBarCode': HBarCode
, 'HProcExchBillNo': HProcExchBillNo
+ , 'HProcExchInterID': HProcExchInterID
+ , 'HProcExchEntryID': HProcExchEntryID
, 'HProcess': HProcess
, 'HICMOInterID': HICMOInterID
, 'HICMOBillNo': HICMOBillNo
@@ -808,7 +817,7 @@
function get_Save(data, HResult) {
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache["mainTable"]);
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubStr+ ";" + sessionStorage["HUserName"] + ";" + HResult;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
var index = layer.load();
$.ajax({
@@ -841,6 +850,23 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+
+ //var HBarCode = $("#HBarCode").val();
+ //if (HBarCode == "") {
+ // layer.msg("浜у搧SN涓嶈兘涓虹┖!")
+ // return false;
+ //}
+
+ var HBadReasonID = $("#HBadReasonID").val();
+ if (HBadReasonID == 0) {
+ layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
+ return false;
+ }
+ return true;
+ }
+
//#endregion
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
index f09a84b..070d666 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
@@ -102,6 +102,8 @@
<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
<input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
<input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID">
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID">
<input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
<input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
<input type="hidden" name="HICMOBillNo" id="HICMOBillNo" lay-verify="HICMOBillNo">
@@ -198,6 +200,8 @@
$("#HBillNo").val(datajson.HBillNo);
$("#HBillNo_bak").val(datajson.HBillNo);
$("#HProcExchBillNo").val(datajson.HProcExchBillNo);
+ $("#HProcExchInterID").val(datajson.HProcExchInterID);
+ $("#HProcExchEntryID").val(datajson.HProcExchEntryID);
$("#HICMOInterID").val(datajson.HICMOInterID);
$("#HICMOBillNo").val(datajson.HICMOBillNo);
$("#HICMOEntryID").val(datajson.HICMOEntryID);
@@ -270,7 +274,7 @@
//鏌ヨ鏉＄爜缁戝畾鐨勮繑淇褰�
get_RepairRecord();
//鏌ヨ鐗╂枡娓呭崟鏁版嵁
- get_BomList($("#HProcExchBillNo").val());
+ get_BomList();
}
//鏌ヨ
@@ -508,13 +512,13 @@
}
//娴佽浆鍗℃煡璇㈠叧閿欢娓呭崟
- function get_BomList(HBarCode) {
+ function get_BomList() {
var index = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
+ url: GetWEBURL() + "/Cj_SingleStation/AssemHBardCodeBomList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HMaterSN": $("#HMaterSN").val(), "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
@@ -549,9 +553,8 @@
, { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
, { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
, { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺' }
+ , { field: 'HBarCode', title: '褰撳墠閰嶄欢鐮�' }
, { field: 'HBatchNo', title: '褰撳墠鎵规' }
- , { field: 'BomHInterID', title: 'BomHInterID', hide: true }
- , { field: 'BomHEntryID', title: 'BomHEntryID', hide: true }
, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
, { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
@@ -559,7 +562,7 @@
, { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
, { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ //, { field: 'HBarCode', title: 'HBarCode', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2' }
]]
}
@@ -597,8 +600,7 @@
var HResult = "閰嶄欢";
var sMainStr = JSON.stringify(data1.field);
var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
- var sSubStr2 = JSON.stringify(table.cache["mainTable2"]);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ";" + sessionStorage["HUserName"] + ";" + HResult;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 5222e51..58f206b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -603,6 +603,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
type: "GET",
+ async: false,
data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -631,6 +632,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -651,37 +653,52 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
-
- var index = layer.load();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
+ url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
+ data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
- layer.close(index);
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- //if (data1.data[0]["HSourceBillNo"] != HProcExchBillNo) {
- // return layer.msg("鎵爜閿欒,璇烽噸鏂版壂!");
- //} else {
- // $("#HBarCode_P").val(HBarCode);
- // layer.msg("鎵爜鎴愬姛!");
- //}
+ layer.close(indexs);
+ var index = layer.load();
- $("#HBarCode_P").val(HBarCode);
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
+ async: false,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(index);
+ $("#HBarCode_P").val(HBarCode);
+ //淇濆瓨鏁版嵁
+ set_AddAssemblyBill();
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
}
else {
- layer.close(index);
+ layer.close(indexs);
layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
$("#HBarCodeSN").val("");
},
error: function (err) {
- layer.close(index);
+ layer.close(indexs);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
@@ -822,6 +839,7 @@
layer.confirm('鏄惁瑕佹妸褰撳墠鎵规:' + option.data[i]["HBatchNo"] + '鏇挎崲鎴愭壒娆�:' + data1.data[0]["HBatchNo"], function (index) {
layer.close(index);
option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
+ option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
option.data[i]["HBarCode"] = HBarCode;
table.render(option);
});
@@ -829,6 +847,7 @@
}
if (data1.data[0]["HMaterNumber"] == option.data[i]["閰嶄欢浠ｇ爜"]) {
option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
+ option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
option.data[i]["HBarCode"] = HBarCode;
KNum += 1;
table.render(option);
@@ -1049,7 +1068,7 @@
, area: ['100%', '100%']//澶у皬
, title: '宸ュ簭涓嶈壇姹囨姤'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
+ , content: ['../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val() + '&HProcExchBillNo=' + $("#HProcExchBillNo").val(), 'yes']
, end: function () {
get_BadRecords($("#HBardCodeProcExchBillNo").val());
}
@@ -1084,7 +1103,6 @@
get_AddBomTempList();
var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
get_BomList(HBardCodeProcExchBillNo);
- get_BadRecords(HBardCodeProcExchBillNo);
//鏌ヨ鍚堟牸璁板綍
get_HGRecords();
//鏌ヨ涓嶈壇璁板綍
--
Gitblit v1.9.1