From a321be71a8a443fdbff239a44cf627535ca8e23c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 21 五月 2024 16:18:50 +0800
Subject: [PATCH] 流转卡生成条码 进站单增加配件条码
---
WebTM/views/PublicPage/HSourceReportHtml.html | 17 ++++++++
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 1
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 78 +++++++++++++++++++++++++++++++++++++++
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 4 ++
4 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index f5b786c..76aed02 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -290,6 +290,9 @@
case '鐢熶骇閫�鏂�':
HModName = "MateOutBackBill_1244";
break;
+ case '宸ュ簭娴佽浆鍗�':
+ HModName = "ProcessExchangeBill_3772";
+ break;
}
//鍒濆鏌ヨ
get_Display(sWhere, HSouceBillType);
@@ -521,6 +524,20 @@
break;
case '缁勮鎷嗗嵏鍗�':
return sWhere;
+ case '宸ュ簭娴佽浆鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ return sWhere;
break;
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 203de9c..ad20103 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -91,6 +91,7 @@
<option value="7">閲囪喘鍏ュ簱鍗�</option>
<option value="8">閿�鍞��璐у崟</option>
<option value="9">鐢熶骇閫�鏂欏崟</option>
+ <option value="10">宸ュ簭娴佽浆鍗�</option>
</select>
</div>
</div>
@@ -466,6 +467,9 @@
case '9':
return "鐢熶骇閫�鏂欏崟";
break;
+ case '10':
+ return "宸ュ簭娴佽浆鍗�";
+ break;
}
}
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/Gy_BarCodeBillList.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/Gy_BarCodeBillList.html"
index 1583e20..259dd90 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/Gy_BarCodeBillList.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/Gy_BarCodeBillList.html"
@@ -414,7 +414,6 @@
, { field: '鏉＄爜鐘舵��', title: '鏉＄爜鐘舵��', width: 200, sort: true }
, { field: '鍘傚晢', title: '鍘傚晢', width: 200, sort: true }
, { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200, sort: true }
- , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss}}</div>", sort: true }
, { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 75c06ca..ae96cf7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -55,6 +55,12 @@
<input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>閰嶄欢鏉″舰鐮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBarCode_Mater" id="HBarCode_Mater" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -1100,6 +1106,49 @@
});
}
+ //閰嶄欢鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode_Mater').on('keydown', function (event) {
+ var HBarCode_Mater = $('#HBarCode_Mater').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode_Mater) {
+ layer.msg("閰嶄欢鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_Mater_KeyDown(HBarCode_Mater);
+ }
+ });
+
+
+ function txtHBarCode_Mater_KeyDown(HBarCode_Mater) {
+ var barNo = HBarCode_Mater.substr(0, 3);
+ if ($('#HProcExchHinteID').val() == '') {
+ layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵厤浠剁爜")
+ layer.close(index);
+ return;
+ }
+
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_Mater_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode_Mater, "HInterID": $('#HInterID').val()},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message);
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
$('#HProcNo').on('keydown', function (event) {
var sProcNo = $('#HProcNo').val();
@@ -1129,6 +1178,10 @@
"HCenterName": data.宸ヤ綔涓績,
"HCenterID": data.HCenterID
});
+
+ //杩涚珯鍗曠粦瀹氶厤浠舵竻鍗�
+ MES_StationInBillSubBindSource();
+
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
layer.close(index);
@@ -1145,6 +1198,31 @@
});
}
+ //杩涚珯鍗曠粦瀹氶厤浠舵竻鍗�
+ function MES_StationInBillSubBindSource() {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/MES_StationInBillSubBindSource",
+ type: "GET",
+ async: false,
+ data: { "HInterID": $("#HInterID").val(), "HProcExchInterID": $("#lngBillKey").val(), "HProcExchEntryID": $("#lngBillSubKey").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message);
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
$('body').on('keydown', function (e) {
var HinteID = $("#HProcExchHinteID").val();
--
Gitblit v1.9.1