From 65968b3e0e9e03ef0904de35b78872224b9ce00a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 223 insertions(+), 7 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 0d89311..31af6c4 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"
@@ -102,7 +102,7 @@
<div class="layui-inline">
<label class="layui-form-label" id="BT_HSourceBillNo">閫夊崟鍙�<label style="color:red">*</label></label>
<div class="layui-input-inline">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -201,6 +201,10 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ var loginCard = params[params[4]]; //鑷姩鐧诲綍ic鍗″彿
+ var HOrgID = params[params[5]];//鐧诲綍缁勭粐id
+ //var HOrgName = params[params[6]];//鐧诲綍缁勭粐鍚嶇О
+ var HTranSlate = params[params[6]];//璇█
}
var OptionData = [];
@@ -267,6 +271,18 @@
})
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鑷姩鐧诲綍
+ if (loginCard != undefined) {
+ var login_result = true;
+ loginByICCard(loginCard)
+ if (login_result) {
+ $("#HSourceBillType").val(HSouceBillType);
+ form.render('select');
+ $("#HSourceBillNo").val(linterid);
+ }
+
+ }
+
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
//鍔犺浇缁勭粐鏁版嵁
@@ -302,6 +318,13 @@
initFunction(1, "Gy_BarCodeBill", sessionStorage["HTranSlate"]);
form.render('select');
+
+ //鐧诲綍鍚庨�変腑婧愬崟鍔ㄤ綔
+ if (loginCard != undefined && login_result == true) {
+ let HSourceBillType = getSupType();
+ getBarCodeByHBillNo(linterid, HSourceBillType)
+
+ }
//#endregion
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
@@ -597,6 +620,24 @@
}
});
});
+
+ //#region 鍥炶溅閫夋嫨婧愬崟
+ $('#HSourceBillNo').on('keydown', function (event) {
+ var HSourceBillNo = $('#HSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+ //$("#HSourceBillType").val(2);
+ //form.render('select');
+ if (event.keyCode == 13) {
+ var ajaxLoad = layer.load();
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
+ return;
+ }
+ let HSourceBillType = getSupType();
+ getBarCodeByHBillNo(HSourceBillNo, HSourceBillType)
+ }
+ });
+ //#endregion
function isAllEqual(array) {
if (array.length > 0) {
@@ -1048,8 +1089,8 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
- DisPlay_HideColumn1();
- DisPlay_HideColumn2();
+ //DisPlay_HideColumn1();
+ //DisPlay_HideColumn2();
}
function set_AddFNew1() {
@@ -1061,17 +1102,17 @@
}];
table.render(option1);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
DisPlay_HideColumn1();
- DisPlay_HideColumn2();
+ //DisPlay_HideColumn2();
}
function set_AddFNew2() {
option2.data = [];
table.render(option2);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- DisPlay_HideColumn1();
+ //DisPlay_HideColumn();
+ //DisPlay_HideColumn1();
DisPlay_HideColumn2();
}
@@ -1989,6 +2030,181 @@
return Result;
}
+ //鏍规嵁鍗曟嵁鍙疯幏鍙栨潯鐮佷俊鎭�
+ function getBarCodeByHBillNo(HBillNo,HSouceBillType) {
+ var ajaxLoad = layer.load();
+ let sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo +"'"
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
+ type: "GET",
+ data: { "page": 1, "limit": 50, "sWhere": sWhere1, "HSouceBillType": HSouceBillType, "HOrgID": sessionStorage["OrganizationID"] },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ HBarInfo = ""; //瀛樺偍鏉＄爜淇℃伅
+ HFileList = ""; //瀛樺偍妗ｆ鍒楄〃
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+ element.tabChange('tab-TabTest', '1');
+ var checkStatus = data1;//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data === null) {
+ layer.close(ajaxLoad);
+ return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));
+ }
+ var list = [];
+ var BillSelect = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i].閮ㄩ棬 != "" && checkStatus.data[i].閮ㄩ棬 != null) {
+ list.push(checkStatus.data[i].閮ㄩ棬)
+ }
+ BillSelect.push({ BillType: checkStatus.data[i].HBillType, BillTitle: getSupType(), BillNo: checkStatus.data[i].鍗曟嵁鍙�, "BillMainID": checkStatus.data[i].HMainID, "BillSubID": checkStatus.data[i].HSubID, "SPID": 0, "BatchNo": "", "HAuxPropID": 0 });
+ }
+ if (isAllEqual(list)) //涓嶅厑璁搁�夋嫨涓嶅悓閮ㄩ棬
+ {
+ //鑾峰彇閫変腑鏁版嵁
+ var GrdSelectData = JSON.stringify(BillSelect);
+ //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+ var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
+ //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+ var HBarCodeType = $("#HBarCodeType").find("option:selected").html();
+ //鑾峰彇褰撳墠鐧诲綍浜哄憳
+ var UserName = sessionStorage["HUserName"];
+ var Str = GrdSelectData + ";" + HSourceBillType + ";" + HBarCodeType + ";" + UserName;
+ //閫氳繃閫夋嫨鐨勬簮鍗曚富瀛愬唴鐮佹煡鎵捐缁嗕俊鎭�
+ $.ajax({
+ type: "post",
+ url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
+ //contentType: 'application/json',
+ async: false,
+ dataType: "json",
+ data: { "msg": Str },
+ //traditional: true,
+ success: function (result) {
+ HMaterID = result.list[0].HMaterID;
+ HBatchNo = result.list[0].HBatchNo;
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ for (let i = 0; i < result.list.length; i++) {
+ result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0] //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
+ if (result.list[i].HMinQty != 0) {
+ result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+ }
+ result.list[i].HEmpID = sessionStorage["HEmpID"]
+ result.list[i].HEmpNumber = sessionStorage["HEmpNumber"]
+ result.list[i].HEmpName = sessionStorage["HEmpName"]
+ }
+
+ BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
+ //for (let i = 0; i < result.list.length; i++) {
+ // result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+ //}
+ console.log(result.list[0]);
+ table.reload('mainTable', {
+ data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
+ //鍏抽棴褰撳墠frame
+ layer.close(ajaxLoad);
+ }
+ }
+ })
+ }
+ else {
+ layer.msg(get_MessageError("[3899-2-001]涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", sessionStorage["HTranSlate"]), { time: 1 * 2000, icon: 5 });
+ }
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+ //鐧诲綍鏍规嵁ic鍗″彿
+ function loginByICCard(HBarCode) {
+ var index = layer.load();
+ //鑾峰彇榛樿缁勭粐鍚嶇О
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (let element of data) {
+ if (element.ID == HOrgID) {
+ sessionStorage["Organization"] = element.Name;
+ }
+ }
+ }
+ },
+ error: function (err) {
+ login_result = false;
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ //鑾峰彇鐧诲綍淇℃伅
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetUserByICCard",
+ type: "GET",
+ async: false,
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(index);
+ sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
+ sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
+ sessionStorage["HMaker"] = result.data[0].Czymc;
+ sessionStorage["HUserName"] = result.data[0].Czymc;
+ sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+ sessionStorage["SourceFlag"] = false;
+ sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+ sessionStorage["HKeeper"] = result.data[0].HKeeper;
+ sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+ sessionStorage["HSecManager"] = result.data[0].HSecManager;
+ sessionStorage["HSellManID"] = result.data[0].HSellManID;
+ sessionStorage["HSellMan"] = result.data[0].HSellMan;
+ sessionStorage["HDeptID"] = result.data[0].HDeptID;
+ sessionStorage["HDept"] = result.data[0].HDept;
+ sessionStorage["HWHID"] = result.data[0].HWhID;
+ sessionStorage["HWHName"] = result.data[0].HWHName;
+ sessionStorage["HSPID"] = result.data[0].HSPID;
+ sessionStorage["HSPName"] = result.data[0].HSPName;
+ sessionStorage["HSupID"] = result.data[0].HSupID;
+ sessionStorage["HSupName"] = result.data[0].HSupName;
+ sessionStorage["Czmm"] = result.data[0].Czmm;
+ sessionStorage["Czybm"] = result.data[0].Czybm;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
+ sessionStorage["HGroup"] = result.data[0].HGroup;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HProc"] = result.data[0].HProc;
+ sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ sessionStorage["HSource"] = result.data[0].HSource;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+ sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
+ sessionStorage["login"] = "login";
+ sessionStorage["OrganizationID"] = HOrgID;
+ //sessionStorage["Organization"] = $("#Organization option:selected").text();
+ sessionStorage["HTranSlate"] = HTranSlate;
+ }
+ else {
+ layer.close(index);
+ login_result = false;
+ layer.msg("鍑虹幇闂锛�" + result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ login_result = false;
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//#endregion
--
Gitblit v1.9.1