From cbd3c6396a01e2f78ed4dc82154cdb913abecfa7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 22 十月 2025 08:40:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
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 31af6c4..55db939 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"
@@ -198,7 +198,7 @@
} else {
debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
+ var linterid = params[params[1]];//婧愬崟id(椤甸潰鐩存帴璋冩暣鎵撳嵃鏃犻渶鐧诲綍鍔熻兘锛�1.浣滀负鍗曟嵁鍙�2.(1,2,3)@(1,2,3)浼犲叆杩欑鏍煎紡鐨勪富id鍜屽瓙id锛�)
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
var loginCard = params[params[4]]; //鑷姩鐧诲綍ic鍗″彿
@@ -278,7 +278,7 @@
if (login_result) {
$("#HSourceBillType").val(HSouceBillType);
form.render('select');
- $("#HSourceBillNo").val(linterid);
+ //$("#HSourceBillNo").val(linterid);
}
}
@@ -319,7 +319,7 @@
initFunction(1, "Gy_BarCodeBill", sessionStorage["HTranSlate"]);
form.render('select');
- //鐧诲綍鍚庨�変腑婧愬崟鍔ㄤ綔
+ //鑷姩鐧诲綍鍚庨�変腑婧愬崟鍔ㄤ綔
if (loginCard != undefined && login_result == true) {
let HSourceBillType = getSupType();
getBarCodeByHBillNo(linterid, HSourceBillType)
@@ -2033,7 +2033,15 @@
//鏍规嵁鍗曟嵁鍙疯幏鍙栨潯鐮佷俊鎭�
function getBarCodeByHBillNo(HBillNo,HSouceBillType) {
var ajaxLoad = layer.load();
- let sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo +"'"
+ HBillNo = decodeURIComponent(HBillNo);
+ let sWhere1 = "";
+ if (HBillNo.includes('@')) {
+ str = HBillNo.split('@', 2);
+ sWhere1 = " and HMainID in " + str[0] + " and HSubID in " + str[1];
+ } else {
+ sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo + "'"
+ }
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
@@ -2049,7 +2057,8 @@
var checkStatus = data1;//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data === null) {
layer.close(ajaxLoad);
- return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));
+ /*return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));*/
+ return layer.msg("娌℃湁瀵瑰簲鍙敓鎴愬崟鎹�");
}
var list = [];
var BillSelect = [];
--
Gitblit v1.9.1