From 25dbb3f546275d4715b537acba0dace02cce871c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 18 三月 2024 17:20:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 1 +
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html | 7 ++++++-
WebTM/views/WMS扫码模块/出门确认单/Xs_OutDoorCheckBillList_PDA.html | 1 +
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f709ba4..4bb018a 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList_PDA.html"
index 19223c7..aca4a6b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList_PDA.html"
@@ -355,6 +355,7 @@
$("#ColName").val("0");
$("#Comparator").val("0");
$("#ColContent").val("");
+ form.render('select');
sWhere = "HStockOrgID=" + HStockOrgID;//璋冪敤鎺ュ彛鍚庨噸缃畇Where
}
//#endregion
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
index 431a492..1c3fb54 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
@@ -428,7 +428,12 @@
HBillNo = $("#HBillNo").val();
HSourceBillNo = $("#HSourceBillNo").val();
var HCusName = $("#HCusName").val();
- sWhere = " and HCusName like ''%" + HCusName + "%''";
+ if (HBillNo == "" && HSourceBillNo=="" && HCusName == "") {
+ sWhere = "";
+ }
+ else {
+ sWhere = " and HCusName like ''%" + HCusName + "%''";
+ }
//鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
DisUploadedList();
});
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 67811da..90fffad 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"
@@ -333,6 +333,7 @@
layer.msg("璇峰厛鎵祦杞崱锛�")
return;
} else {
+ HBarCode = HBarCode.toUpperCase();
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
--
Gitblit v1.9.1