From ed01a1cd55d11dd274a8ceb3955c3ea6e1cceb78 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 09 四月 2026 13:15:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_HuaZhou.html | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 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_HuaZhou.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_HuaZhou.html"
index 7e3c037..eb70ddc 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_HuaZhou.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_HuaZhou.html"
@@ -68,7 +68,6 @@
<label class="layui-form-label" id="BT_HWorksNumber">宸ュ巶浠ｇ爜</label>
<div class="layui-input-inline">
<select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
-
</select>
</div>
</div>
@@ -102,7 +101,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" 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>
@@ -112,7 +111,6 @@
<label class="layui-form-label" id="BT_HBarCodeType">鏉＄爜绫诲瀷</label>
<div class="layui-input-inline">
<select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
-
</select>
</div>
</div>
@@ -280,7 +278,7 @@
form.render('select');
//$("#HSourceBillNo").val(linterid);
}
-
+
}
//鍒濆鍖栬〃鍗曟彃浠�
@@ -293,7 +291,7 @@
set_HBarCodeType();
var rowdata = [{
- "HMaterID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "", "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": "",
+ "HMaterID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "","HZQty":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": ""
}];
//鍒濆鍖栬〃鏍�
@@ -335,7 +333,7 @@
var AddRow = table.cache['mainTable'];
var NewRow = {
- "HMaterID": 0, "HSubID": 0, "HSupID": 0,"HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "","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": "",
+ "HMaterID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "", "HZQty": 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": ""
};
//console.log(NewRow);
@@ -441,6 +439,7 @@
obj.update({
HQty: value, //鏁伴噺
HBQty: Math.ceil(value / HMinQty), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+ HZQty: Math.ceil(value / HMinQty), //鎬荤鏁�=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
break;
@@ -461,6 +460,7 @@
obj.update({
HMinQty: value, //鏈�灏忓寘瑁呮暟閲�
HBQty: Math.ceil(HQty / value), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+ HZQty: Math.ceil(value / HMinQty), //鎬荤鏁�=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
@@ -660,17 +660,17 @@
$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
for (var i = 0; i < table.cache['mainTable'].length; i++) {
table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
- if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
+ if (table.cache["mainTable"][i].HMaterName != null && (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
}
- if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
+ if (table.cache["mainTable"][i].HMaterModel != null && (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
}
- if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
+ if (table.cache["mainTable"][i].HPinfan != null && ("HPinfan" in table.cache["mainTable"][i])) {
if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
}
- }
+ }
}
var sSubStr = JSON.stringify(table.cache['mainTable']);
HMaterInfo = table.cache['mainTable'];
@@ -732,7 +732,7 @@
var data = checkStatus.data;
var arr = [];
-
+
for (var i = 0; i < data.length; i++) {
arr.push({
"HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
@@ -747,7 +747,7 @@
, "HCheckEmpName": ""
})
}
-
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -933,7 +933,7 @@
, { field: 'HCusName', title: '瀹㈡埛鍚嶇О', edit: 'text', event: 'HCusName', width: 120 }
, { field: 'HSupID', title: '渚涘簲鍟唅d', width: 100, hide: true }
, { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: 'HSupNumber', width: 120 }
- , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', edit: 'text', event: 'HSupName',width: 120 }
+ , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', edit: 'text', event: 'HSupName', width: 120 }
, { field: 'JMHSupID', title: '閲戦┈渚涘簲鍟咺D', width: 100, hide: true }
, { field: 'JMHSupNumber', title: '閲戦┈渚涘簲鍟嗕唬鐮�', edit: 'text', event: 'JMHSupNumber', width: 120 }
, { field: 'JMHSupName', title: '閲戦┈渚涘簲鍟嗗悕绉�', edit: 'text', event: 'JMHSupName', width: 120 }
@@ -944,9 +944,10 @@
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
, { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
, { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HZQty', title: '鎬荤鏁�', width: 120, edit: 'text' }
, { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
, { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
- , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+ , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
@@ -1094,7 +1095,7 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
option.data = [{
- "HMainID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "", "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+ "HMainID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "JMHSupID": 0, "JMHSupNumber": "", "JMHSupName": "", "HTH": "", "HZQty": 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": "",
@@ -1214,7 +1215,7 @@
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: [contentUrl, "yes"]
- ,btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+ , btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, btn1: function (index, laero) {
if (value == 0) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1616,7 +1617,7 @@
childData = null;
}
-
+
childPage = null;
currRowIndex = 0;
@@ -1663,8 +1664,8 @@
obj.update({
"JMHSupID": childData.HItemID,
"JMHSupNumber": childData.渚涘簲鍟嗕唬鐮�,
- "JMHSupName": childData.渚涘簲鍟嗗悕绉�,
- });
+ "JMHSupName": childData.渚涘簲鍟嗗悕绉�,
+ });
childData = null;
}
}
@@ -1696,8 +1697,8 @@
obj.update({
"JMHSupID": childData.HItemID,
"JMHSupNumber": childData.渚涘簲鍟嗕唬鐮�,
- "JMHSupName": childData.渚涘簲鍟嗗悕绉�
- });
+ "JMHSupName": childData.渚涘簲鍟嗗悕绉�
+ });
childData = null;
}
@@ -1993,7 +1994,7 @@
})
OptionData = [];
}
- }
+ }
});
}
//鐝粍浠ｇ爜
@@ -2327,7 +2328,7 @@
}
//鏍规嵁鍗曟嵁鍙疯幏鍙栨潯鐮佷俊鎭�
- function getBarCodeByHBillNo(HBillNo,HSouceBillType) {
+ function getBarCodeByHBillNo(HBillNo, HSouceBillType) {
var ajaxLoad = layer.load();
HBillNo = decodeURIComponent(HBillNo);
let sWhere1 = "";
@@ -2337,7 +2338,7 @@
} else {
sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo + "'"
}
-
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
@@ -2495,7 +2496,7 @@
sessionStorage["login"] = "login";
sessionStorage["OrganizationID"] = HOrgID;
//sessionStorage["Organization"] = $("#Organization option:selected").text();
- sessionStorage["HTranSlate"] = HTranSlate;
+ sessionStorage["HTranSlate"] = HTranSlate;
}
else {
layer.close(index);
--
Gitblit v1.9.1