From badb75b05113a648326a4be376cd1d2fda55e26f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 25 九月 2024 10:05:09 +0800
Subject: [PATCH] 产品防错验证清单列表 只显示主表 上模单 报错提示
---
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html | 6 ++++--
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 26 ++++++++++++++++++++++++--
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 2 +-
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index db4a0a3..47a6fc4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -522,19 +522,41 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
+ var HBillType = "";
+ var barNo = "";
+ if (HBarCode.length < 22) {
+ barNo = HBarCode.substr(0, 4);
+ switch (barNo) {
+ case "GXLX":
+ HBillType = "3772";
+ break;
+ }
+ }
+
+ if (HBarCode.length > 22) {
+ barNo = HBarCode.substr(0, 22);
+ switch (barNo) {
+ case "https://qr61.cn/omM1Cj":
+ HBillType = "3899";
+ break;
+ case "https://qr61.cn/oAhaGh":
+ HBillType = "3308";
+ break;
+ }
+ }
var index = layer.load();
$.ajax({
url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
+ data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": HBillType },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
layer.close(index);
$("#HBarCode").val("");
-
+
var num = data["Num"];
if ($("#HSourceID").val() == "0" && num != 1) {
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/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.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/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
index eae9a1c..58a74a2 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/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.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/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
@@ -393,8 +393,10 @@
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', sort: true }
, { field: 'HEquipID', title: 'HEquipID', hide: true, sort: true }
- , { field: '鐢熶骇璁惧浠ｇ爜', title: '鐢熶骇璁惧浠ｇ爜', sort: true }
- , { field: '鐢熶骇璁惧', title: '鐢熶骇璁惧', sort: true }
+ , { field: '鐢熶骇涓昏澶囦唬鐮�', title: '鐢熶骇涓昏澶囦唬鐮�', sort: true }
+ , { field: '鐢熶骇涓昏澶�', title: '鐢熶骇涓昏澶�', sort: true }
+ , { field: '杈呭姪璁惧浠ｇ爜', title: '杈呭姪璁惧浠ｇ爜', sort: true }
+ , { field: '杈呭姪璁惧', title: '杈呭姪璁惧', sort: true }
, { field: 'HWorkerID', title: 'HWorkerID', hide: true, sort: true }
, { field: '鎿嶄綔宸ヤ唬鐮�', title: '鎿嶄綔宸ヤ唬鐮�', sort: true }
, { field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', 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/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 15c1aad..bd9c223 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"
@@ -338,7 +338,7 @@
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150, templet: function (e) {
var html = "";
if (e.宸ュ簭鍚嶇О == "鎷嶇収" ) {
- html = '<a style="color:#1E9FFF" href="' + e.鐓х墖璺緞 + '" target="main_self_frame">' + e.鐓х墖璺緞+'</a>';
+ html = '<a style="color:#1E9FFF" href="" target="main_self_frame">' + e.鐓х墖璺緞+'</a>';
}
return html
}
--
Gitblit v1.9.1