From 712633b1f1c09f1bd4b46504457036cc708c5cea Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 24 六月 2024 23:08:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 2
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 71 ++++++++++++++++-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 42 +++++++---
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 27 ++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 19 +++-
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 1
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 26 ++++--
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_CF.html | 2
9 files changed, 151 insertions(+), 41 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index 1c1105d..01247d4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -333,6 +333,10 @@
$("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HPlanInterID").val(checkStatus.data[0].hmainid);
+ $("#HMouldID").val(checkStatus.data[0].HMouldID);
+ $("#HMouldName").val(checkStatus.data[0].浜у搧妯″叿);
+ $("#HMouldDotCheckRuleID").val(checkStatus.data[0].HMouldDotCheckRuleID);
+ $("#HMouldDotCheckRuleName").val(checkStatus.data[0].HMouldDotCheckRuleNo);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
//$.ajax({
// url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
@@ -453,6 +457,8 @@
console.log(checkStatus);
$("#HMouldDotCheckRuleName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+ $("#HMouldID").val(checkStatus.data[0].HMouldID);
+ $("#HMouldName").val(checkStatus.data[0].妯″叿鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_DocCheckItem2(checkStatus.data[0].hmainid);
}
@@ -806,8 +812,8 @@
if (result != null) {
if (result.count == 1) {
var BYData = result.list[0];//鐐规
- var PJData = result.list[1];//閰嶄欢
- var rowdate1 = layui.table.cache["mainTable"];
+ //var PJData = result.list[1];//閰嶄欢
+ //var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
@@ -816,9 +822,9 @@
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
- "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerCode,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+ "HDotCheckItemID": BYData[i].鐐规椤圭洰ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
+ "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浠ｇ爜,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -845,8 +851,8 @@
if (result != null) {
if (result.count == 1) {
var BYData = result.list[0];//鐐规
- var PJData = result.list[1];//閰嶄欢
- var rowdate1 = layui.table.cache["mainTable"];
+ //var PJData = result.list[1];//閰嶄欢
+ //var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
@@ -855,9 +861,9 @@
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
- "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+ "HDotCheckItemID": BYData[i].鐐规椤圭洰ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
+ "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].瀛愬娉�, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index 284afab..e7da65b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -150,7 +150,7 @@
</html>
<script>
layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 67e35cf..0af8888 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -87,7 +87,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -359,6 +359,7 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ var OptionData = [];
var HBillType = ""; //鍗曟嵁绫诲瀷
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
@@ -647,6 +648,65 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
if (AllowLoadData(data)) {
+ //绂佺敤淇濆瓨鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁鍕鹃��
+ Xt_AllowLoadData(data);
+ }
+ });
+
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁閫変腑
+ function Xt_AllowLoadData(data2) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.Verify == "Y") //鍒峰崱楠岃瘉
+ {
+ layer.msg("闇�瑕佽繘琛屽埛鍗￠獙璇�!", { time: 1 * 1000, icon: 1 }, function (index) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'IC鍒峰崱',
+ closeBtn: 1,
+ shift: 2,
+ area: ['50%', '80%'],
+ maxmin: true,
+ content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
+ end: function () {
+ if (OptionData.length > 0) {
+ if (OptionData[0]["data"] == "1") {
+ save(data2);
+ } else if (OptionData[0]["data"] == "0") {
+ layer.msg("鍥犱负鎶�鑳戒笉鍖归厤,鏃犳硶淇濆瓨!")
+ }
+ OptionData = [];
+ } else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+ });
+ });
+ }
+ else {
+ save(data2);
+ }
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ function save(data) {
+
var index = layer.load();
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
@@ -694,10 +754,8 @@
layer.alert(err, { icon: 5 })
}
})
- }
-
-
- });
+
+ }
//瀹℃牳鎸夐挳鎻愪氦
form.on('submit(VerIfySaver)', function (data) {
@@ -1018,6 +1076,9 @@
$("#HGroupName").val(obj[0].鐝粍鍚嶇О);
$("#HGroupID").val(obj[0].HItemID);
}
+ function GetSwipeCardStart(obj) {
+ OptionData[0] = obj;
+ }
</script>
</body>
</html>
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/RetrospectiveQueryReport.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/RetrospectiveQueryReport.html"
index 6c4a452..ee6f419 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/RetrospectiveQueryReport.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/RetrospectiveQueryReport.html"
@@ -257,6 +257,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'numbers', title: '搴忓彿' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index b057258..23c1e9a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -108,12 +108,19 @@
<input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" 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="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ </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="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -164,10 +171,9 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇缁勭粐</label>
+ <label class="layui-form-label">閬楀け鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ <input type="text" class="layui-input" value="0" name="HLossQty" id="HLossQty" onfocus="this.select();">
</div>
</div>
</div>
@@ -183,17 +189,23 @@
</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="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
- <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
- </div>
- </div>-->
+ <label class="layui-form-label">鏍哥畻宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="杞笅閬�" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled>
<input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
+ </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" value="0" name="HToCheckQty" id="HToCheckQty" onfocus="this.select();">
</div>
</div>
</div>
@@ -897,6 +909,8 @@
"HBackWorkQty": data.杩斿伐鏁伴噺,
"HShiftsID": data.HShiftsID,
"HShiftsName": data.鐝鍚嶇О,
+ "HToCheckQty": data.鍙栨牱鏁伴噺,
+ "HLossQty": data.閬楀け鏁伴噺,
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index ede9410..f0663cd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -203,7 +203,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">绌村彿</label>
<div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
+ <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HBadCount" id="HBadCount" value="0" style="width: 150px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">閬楀け鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HLossQty" id="HLossQty" value="0" style="width: 150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鍙栨牱鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HToCheckQty" id="HToCheckQty" value="0" style="width: 150px;">
</div>
</div>
</div>
@@ -1030,8 +1050,9 @@
layer.msg("璇锋壂娴佽浆鍗★紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HQty").val() == 0) {
- layer.msg("鏁伴噺涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HQty").val() == 0 && $("#HBadCount").val() == 0) {
+
+ layer.msg("涓嶈壇鍜屽悎鏍兼暟閲忎笉鑳藉悓鏃朵负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index e21ffd6..8bdc6a7 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -1515,7 +1515,7 @@
}
, end: function () {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();
if (sProcNo != "") {
txtHProcNo_KeyDown(sBillNo, sProcNo);
}
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index 9ca519b..ffaa0aa 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -174,12 +174,18 @@
<input type="hidden" name="HUnitID" id="HUnitID" value="0">
</div>
</div>
- <!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏉愯川</label>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鎵规鍙�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
</div>
- </div>-->
+ </div>
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏉愯川</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
@@ -1024,7 +1030,7 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1 ) {//鏃犳簮鍗曟柊澧�
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3772' },
success: function (d) {
@@ -1062,7 +1068,7 @@
layer.alert(result.Message, { icon: 5 });
} else {
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3772' },
success: function (d) {
@@ -2269,6 +2275,7 @@
, "HMaterModel": data.鏉愭枡瑙勬牸
, "HWidth": data.骞呭
, "HWeight": data.鍏嬮噸
+ , "HBatchNo": data.鎵瑰彿
, "HAuxQty": data.杈呮暟閲�
, "HAuxUnit": data.HAuxUnit
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_ProcessExchangeBill_CF.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_ProcessExchangeBill_CF.html"
index 45d1d69..87b4d42 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_ProcessExchangeBill_CF.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_ProcessExchangeBill_CF.html"
@@ -81,7 +81,7 @@
<div class="layui-inline">
<label class="layui-form-label">鎵瑰彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1