From f2023ce86836cebf4a241fbc7225c3a7dec6d86c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:09 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 11 +++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 37 +++++++++---
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | 7 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 34 +++++++----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 1
WebTM/views/质量管理/来料检验单/Kf_QCStockInCheckBill_Fast.html | 68 ++++++++++++++++++++++
7 files changed, 137 insertions(+), 23 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
index 269ff70..bbb19c8 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
@@ -98,6 +98,15 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏄惁鍙栧簱瀛�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HIsStockQty" lay-filter="HIsStockQty" id="HIsStockQty">
+ <option value="0" selected>鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -155,15 +164,15 @@
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 75px;">
- <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 75px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅*</label>
<div class="layui-input-block" style="margin-left: 71px;">
@@ -252,6 +261,14 @@
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 56%;">
+ <label class="layui-form-label" style="width: 85px;">搴曢儴澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
</div>
@@ -981,6 +998,7 @@
, "HUnitID": d.data[0].HUnitID
, "HUnitName": d.data[0].璁￠噺鍗曚綅
, "HSTATUS": HSTATUS
+ , "HIsStockQty": d.data[0].HIsStockQty
, "HBomID": d.data[0].HBomID
, "HBomName": d.data[0].BOM鍗曠紪鐮�
, "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd")
@@ -988,6 +1006,7 @@
, "HBeginDate": Format(new Date(d.data[0].鏈�杩熷紑宸ユ棩鏈�), "yyyy-MM-dd")
, "HEndDate": Format(new Date(d.data[0].鏈�杩熷畬宸ユ棩鏈�), "yyyy-MM-dd")
, "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HRemark3": d.data[0].搴曢儴澶囨敞
, "HAuxQty": d.data[0].HAuxQty
, "HAuxUnit": d.data[0].HAuxUnit
, "HAuxUnitName": d.data[0].HAuxUnitName
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
index 8ba50a3..21a41f3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
@@ -339,7 +339,9 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-upload">
- <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button>
+ <!--<input class="layui-upload-file" type="file" accept="" name="file" multiple="">-->
+ <button type="button" class="layui-btn" id="camera" capture="user"><i class="layui-icon">顧�</i>鎷嶇収涓婁紶</button>
<div class="layui-upload-list">
<table class="layui-table">
<thead>
@@ -548,6 +550,7 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
PicUpload();
+ PicUploads();
}
});
}
@@ -1144,6 +1147,69 @@
audio.play();
}
+
+ //鎷嶇収涓婁紶
+ function PicUploads() {
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#camera'
+ , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile2"
+ , accept: 'file'
+ , multiple: true
+ , acceptMime: 'image/*'
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , choose: function (obj) {
+ var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function (index, file, result) {
+ var tr = $(['<tr id="upload-' + index + '">'
+ , '<td>' + file.name + '</td>'
+ , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+ , '<td>绛夊緟涓婁紶</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ //鍗曚釜閲嶄紶
+ tr.find('.demo-reload').on('click', function () {
+ obj.upload(index, file);
+ return false;
+ });
+
+ //鍒犻櫎
+ tr.find('.demo-delete').on('click', function () {
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ ProImgByList.append(tr);
+ });
+ }
+ , done: function (res, index, upload) {
+ if (res.code == 1) { //涓婁紶鎴愬姛
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(3).html(''); //娓呯┖鎿嶄綔
+ //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
+ return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+ }
+ this.error(index, upload);
+ }
+ , error: function (index, upload) {
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+ tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+ }
+
+ });
+ }
//鏂囦欢涓婁紶
function PicUpload() {
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_StationInBill_PDA_QiaoYi.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_StationInBill_PDA_QiaoYi.html"
index 1d08da6..9be68f8 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_StationInBill_PDA_QiaoYi.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_StationInBill_PDA_QiaoYi.html"
@@ -167,6 +167,12 @@
</td>
</tr>
<tr>
+ <th>姹囨�诲彂甯冩暟閲�</th>
+ <td class="bz_td">
+ <input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
<input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px;">
@@ -1037,6 +1043,7 @@
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrg": data.缁勭粐,
"HPRDOrgID": data.缁勭粐,
+ "HmaterOutqty": data.鍑虹珯鏁伴噺,
"HQty": result.data.length > 1 ? (result.data[0].娴佽浆鍗℃暟閲� < result.data[1].鍑虹珯鍏宠仈鏁伴噺 ? data.娴佽浆鍗℃暟閲�: result.data[1].鍑虹珯鍏宠仈鏁伴噺): data.娴佽浆鍗℃暟閲�,
});
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_QiaoYi.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_QiaoYi.html"
index bd9d039..e7e79e2 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_QiaoYi.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_QiaoYi.html"
@@ -173,6 +173,12 @@
<input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
</td>
</tr>
+ <tr>
+ <th>姹囨�诲彂甯冩暟閲�</th>
+ <td class="bz_td">
+ <input type="text" name="Hzfbsl" class="layui-input" id="Hzfbsl" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
+ </td>
+ </tr>
<tr>
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
@@ -762,6 +768,7 @@
"HPRDOrg": data.缁勭粐鍚嶇О,
"HCenterName": data.宸ヤ綔涓績,
"HCenterID": data.HCenterID,
+ "Hzfbsl": data.鍑虹珯鏁伴噺,
"lngBillSubKey": data.hsubid,
//"NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺),
"HQty": result.data.length > 1 ? (result.data[0].娴佽浆鍗℃暟閲� < result.data[1].杩涚珯鍏宠仈鏁伴噺 ? data.娴佽浆鍗℃暟閲� : result.data[1].杩涚珯鍏宠仈鏁伴噺) : data.娴佽浆鍗℃暟閲�,
@@ -1198,7 +1205,11 @@
$("#HmaterOutqty").css("background", "");
} else if (data.鏈亾宸ュ簭 == "鏄�") {
FirstEndHProcNo = 2;
+ } else {
+ $("#HmaterOutqty").attr("readonly", true);
+ $("#HmaterOutqty").css("background", "#efefef4d");
}
+
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
layer.close(index);
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 2be711d..2ad61f0 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"
@@ -2448,6 +2448,7 @@
$("#HCusID").val(data.HCusID);
$("#HCusNames").val(data.瀹㈡埛);
$("#HColorRemark").val(data.鏌撹壊瑕佹眰);
+ //$("#HRemark3").val(data.搴曢儴澶囨敞);
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
form.render("checkbox");
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 9a58cc9..68e6019 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"
@@ -1645,7 +1645,7 @@
if (checkStatus.data.length > 0) {
for (var i = 0; i < data.length; i++) {
var HInterID = data[i].hmainid.toString();
- var sWhere = "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.澶囨敞2,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID +") order by cast(b.娴佹按鍙� as int)";
+ var sWhere = "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID +") order by cast(b.娴佹按鍙� as int)";
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
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_Mul.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_Mul.html"
index f2ac88e..f7a7303 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_Mul.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_Mul.html"
@@ -180,19 +180,19 @@
</div>
</div>
<!--<div class="layui-inline" >
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">杈呭姪鍗曚綅</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">杈呭姪鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏉愭枡瑙勬牸 </label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" >
+ <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel">
</div>
</div>
</div>
@@ -220,6 +220,11 @@
<input type="text" hidden lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" /><!--璁″垝瀹屽伐鏃ユ湡-->
<input type="text" hidden lay-verify="HUnitID" name="HUnitID" id="HUnitID" /><!--璁￠噺鍗曚綅-->
<input type="text" hidden lay-verify="HUnitNumber" name="HUnitNumber" id="HUnitNumber" /><!--璁￠噺鍗曚綅浠ｇ爜-->
+ <input type="text" hidden lay-verify="HRemark3" name="HRemark3" id="HRemark3" /><!--搴曢儴澶囨敞-->
+ <input type="text" hidden lay-verify="HRemark2" name="HRemark2" id="HRemark2" /><!--鐧藉澂瑕佹眰-->
+ <input type="text" hidden lay-verify="HColorRemark" name="HColorRemark" id="HColorRemark" /><!--鏌撹壊瑕佹眰-->
+ <input type="text" hidden lay-verify="HCusID" name="HCusID" id="HCusID" /><!--瀹㈡埛-->
+ <input type="text" hidden lay-verify="HEmpID" name="HEmpID" id="HEmpID" /><!--涓氬姟鍛�-->
</form>
</div>
</div>
@@ -364,7 +369,7 @@
var dataNum = [];
var HBillNo = $("#HBillNo").val();
for (var i = 0; i < HProcessExchangeSum; i++) {
- dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty, "HSplitNo": 0});
+ dataNum.push({ "HBillNo": HBillNo + "-" + (i + 1), "HQty": HProcessExchangeHqty, "HSplitNo": 0});
}
option1.data = dataNum;
table.render(option1);
@@ -715,6 +720,11 @@
$("#HUnitNumber").val(data1.data[0].璁￠噺鍗曚綅浠ｇ爜);
$("#HWidth").val(data1.data[0].HWidth);
$("#HWeight").val(data1.data[0].HWeight);
+ $("#HRemark3").val(data1.data[0].搴曢儴澶囨敞);
+ $("#HRemark2").val(data1.data[0].琛ㄥご澶囨敞);
+ $("#HColorRemark").val(data1.data[0].鏌撹壊瑕佹眰);
+ $("#HCusID").val(data1.data[0].HCusID);
+ $("#HEmpID").val(data1.data[0].HEmpID);
//$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
//$("#HAuxUnit").val(data1.data[0].HAuxUnit);
// $("#HMaterModel").val(data1.data[0].HMaterModel);
@@ -775,7 +785,7 @@
type: "get",
url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
async: true,
- data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
+ data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "' and 宸ュ簭浠ｇ爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data;
var Tablerow = [];
--
Gitblit v1.9.1