From f5c1992f2982928329faf7fd830798849b755629 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 05 八月 2025 09:40:13 +0800
Subject: [PATCH] 条码生成模块选源单、重置、按F7选择物料等功能优化
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 47 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 157cbe1..0d89311 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"
@@ -514,6 +514,11 @@
content: [url, 'yes'],
btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])],
btn1: function (index, layero) {
+ HBarInfo = ""; //瀛樺偍鏉＄爜淇℃伅
+ HFileList = ""; //瀛樺偍妗ｆ鍒楄〃
+ $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+ element.tabChange('tab-TabTest', '1');
+
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
@@ -658,32 +663,7 @@
title: get_MessageError("[0000-2-009]鎻愮ず", sessionStorage["HTranSlate"]),
icon: 3,
}, function (index) {
- $("#HOrgID").find("option").remove(); //娓呴櫎婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗕腑鐨勫��
- set_HOrg(); //璋冪敤鑾峰彇婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗙殑鍊�
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
- $("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
- $("#HBarCodeType").val('0');
- var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
- table.reload('mainTable', {
- data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
- var arr1 = [{
- "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
- , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
- , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
- , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
- }]
- table.reload('mainTable1', {
- data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
-
- //鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
- element.tabChange('tab-TabTest', '1');
- //鍔犺浇妗ｆ鍒楄〃
- table.reload('mainTable2', {
- data: [] // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
- layer.close(index)
+ location.replace('Gy_BarCodeBill.html?OperationType=1');
})
})
@@ -888,6 +868,7 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
, { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
, { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+ , { field: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
, { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
@@ -903,6 +884,7 @@
, { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
, { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
, { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
@@ -928,7 +910,6 @@
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HDate', title: '鏉＄爜鏃ユ湡', width: 100, hide: true }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -1058,7 +1039,7 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
option.data = [{
- "HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+ "HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
@@ -1600,6 +1581,8 @@
//鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
if (obj.event === 'HMaterNumber') //鐗╂枡淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
{
+ //鑾峰彇缁勭粐ID
+ var HOrgID = $("#HOrgID").find("option:selected").val();
//椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
type: 2,
@@ -1609,7 +1592,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, btn1: function (index, layero) {
@@ -1619,26 +1602,41 @@
if (checkStatus.data.length === 0) {
return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
}
- //console.log(obj.data);
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterNumber: checkStatus.data[0].HNumber,
- HMaterName: checkStatus.data[0].HName,
- HMaterModel: checkStatus.data[0].HModel,
- HUnitID: checkStatus.data[0].HUnitID,
- HUnitNumber: checkStatus.data[0].HUnitNumber,
- HUnitName: checkStatus.data[0].HUnitName
- });
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length >= 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
+ };
- if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
- obj.update({
- HQty: 1, //鏁伴噺
- HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
- HBQty: 1 //绠辨暟
- });
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].HMaterNumber = resultData.HMaterNumber;
+ option.data[rowIndex + i].HMaterName = resultData.HMaterName;
+ option.data[rowIndex + i].HMaterModel = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].HUnitNumber = resultData.HUnitNumber;
+ option.data[rowIndex + i].HUnitName = resultData.HUnitName;
+
+ if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉＄爜') {
+ option.data[rowIndex + i].HQty = 1; //鏁伴噺
+ option.data[rowIndex + i].HMinQty = 1; //鏈�灏忓寘瑁呮暟閲�
+ option.data[rowIndex + i].HBQty = 1; //绠辨暟
+ }
+ }
+ table.render(option);
}
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ layer.closeAll();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1873,6 +1871,31 @@
}
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇鐗╂枡璇︾粏淇℃伅
+ function getMaterialByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({
+ url: GetWEBURL() + "Cg_ContractBill/getMaterialByMaterID",
+ async: false,
+ type: "GET",
+ data: {
+ "HMaterID": HMaterID
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data;
+ resultData = data[0];
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return resultData;
+ }
+ //#endregion
+
//鏉＄爜鐢熸垚
function SaveBarCodeCreate(sMainSub, CampanyName) {
$.ajax(
--
Gitblit v1.9.1