From d14c5dd9ebf781216f5b613f4f757f1d13e27c75 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 13 九月 2025 22:20:22 +0800
Subject: [PATCH] 生成条码添加用户，组织，工号，条码日期；启用物料信息方法替换；新增物料信息添加物料名称显示，物料信息校验不成功不允许保存，添加供应商过滤
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 177 +++++++++++++++-------------------------------------------
1 files changed, 46 insertions(+), 131 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
index 00c96da..9f84fde 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -539,7 +539,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"];
var _sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < _sSubStr.length; i++) {
if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HMinQty == 0 || _sSubStr[i].HWXQty == 0)) {
@@ -616,7 +616,7 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HBarItemID', title: '鏉＄爜ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
-/* , { field: 'LSH', title: '娴佹按鍙�', width: 120 }*/
+ /* , { field: 'LSH', title: '娴佹按鍙�', width: 120 }*/
/* , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
, { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
, { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120 }
@@ -634,7 +634,7 @@
, { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, hide: true }
, { field: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100, hide: true }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, hide: true }//, event: "chooseHKFDate"
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true}//
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
, { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, hide: true }//, event: "chooseHKFDQDate"
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
, { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
@@ -657,38 +657,38 @@
var rowdata_1 = [];
for (var i = 0; i < data.length; i++) {
-
- rowdata_1.push({
- "HMaterID": data[i].HMaterID,
- "HBarItemID": data[i].HBarItemID,
-/* "LSH": data[i].HBarItemID,*/
- "HBarCode": data[i].HBarCode,
- "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- "HMaterShortNumber": "",
- "HSubjoin": data[i].鐗╂枡绠�绉�,
- "HMaterName": data[i].鐗╂枡鍚嶇О,
- "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- "HMinQty": data[i].鏍囧噯鍖呰鏁�,
- "HBQty": data[i].鏈�灏忓寘瑁呮暟,
- "HSourceBillType": data[i].鏉＄爜绫诲瀷,
- "HBatchNo": data[i].鎵瑰彿,
- "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
- "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
- "HKFDQDate": data[i].鏈夋晥鏈�,
- "HKFDate": data[i].鐢熶骇鏃ユ湡,
- "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].HSupID,
- "HSupName": data[i].渚涘簲鍟嗗悕绉�,
- "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty":data[i].鐢熸垚鏉＄爜鏁伴噺 , // 鏈鐢熸垚鏉＄爜鏁伴噺
- "biaoqianzhangshu": 1,
- "HStatusMan": data[i].宸ュ彿,
- "HBarCodeDate": data[i].鏉＄爜鏃ユ湡,
- "HLSH": data[i].娴佹按鍙�,
- });
-
-
-
+
+ rowdata_1.push({
+ "HMaterID": data[i].HMaterID,
+ "HBarItemID": data[i].HBarItemID,
+ /* "LSH": data[i].HBarItemID,*/
+ "HBarCode": data[i].HBarCode,
+ "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
+ "HMaterShortNumber": "",
+ "HSubjoin": data[i].鐗╂枡绠�绉�,
+ "HMaterName": data[i].鐗╂枡鍚嶇О,
+ "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+ "HMinQty": data[i].鏍囧噯鍖呰鏁�,
+ "HBQty": data[i].鏈�灏忓寘瑁呮暟,
+ "HSourceBillType": data[i].鏉＄爜绫诲瀷,
+ "HBatchNo": data[i].鎵瑰彿,
+ "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
+ "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
+ "HKFDQDate": data[i].鏈夋晥鏈�,
+ "HKFDate": data[i].鐢熶骇鏃ユ湡,
+ "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
+ "HSupID": data[i].HSupID,
+ "HSupName": data[i].渚涘簲鍟嗗悕绉�,
+ "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
+ "HQty": data[i].鐢熸垚鏉＄爜鏁伴噺, // 鏈鐢熸垚鏉＄爜鏁伴噺
+ "biaoqianzhangshu": 1,
+ "HStatusMan": data[i].宸ュ彿,
+ "HBarCodeDate": data[i].鏉＄爜鏃ユ湡,
+ "HLSH": data[i].娴佹按鍙�,
+ });
+
+
+
}
// 鏇存柊琛ㄦ牸鏁版嵁
@@ -698,104 +698,19 @@
}
});
//#endregion
-
- // #region 鎴愬姛鏉＄爜灞曠ず
- //$.ajax({
- // type: "GET",
- // url: GetWEBURL() + "/showHBarCodeBillDetail",
- // async: true,
- // data: { sMsg: lentryid, user: sessionStorage["Organization"] },
- // dataType: "json",
- // success: function (data_1) {
- // if (data_1.count != 0) {
- // var data = data_1.data;
- // var rowdata_1 = [];
- // var IDdif = data[0].HItemID;
- // for (var i = 0,k=1; i < data.length; i++,k++) {
- // var totalQty = data[i].鐢熸垚鏉＄爜鏁伴噺; // 鎬绘潯鐮佹暟
- // var standardQty = data[i].鏍囧噯鍖呰鏁�; // 鏍囧噯鍖呰鏁�
- // var labelCount = Math.ceil(totalQty / standardQty); // 璁＄畻鏍囩鏁�
- // var lastQty_sign = (totalQty % standardQty == 0) ? 0 : 1;//鍒ゆ柇鏄惁鏈変綑鏁�
- // if (k == labelCount && lastQty_sign==1) {
- // rowdata_1.push({
- // "HMaterID": data[i].HItemID,
- // "HBarCode": data[i].HBarCode,
- // "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- // "HMaterShortNumber": "",
- // "HMaterName": data[i].鐗╂枡鍚嶇О,
- // "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- // "HMinQty": standardQty ,
- // "HBQty": data[i].鏈�灏忓寘瑁呮暟,
- // "HSourceBillType": data[i].鏉＄爜绫诲瀷,
- // "HBatchNo": data[i].鎵瑰彿,
- // "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
- // "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
- // "HKFDQDate": data[i].鏈夋晥鏈�,
- // "HKFDate": data[i].鐢熶骇鏃ユ湡,
- // "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- // "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
- // "HSupName": data[i].渚涘簲鍟嗗悕绉�,
- // "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- // "HQty": (totalQty % standardQty), // 鏈鐢熸垚鏉＄爜鏁伴噺
- // "biaoqianzhangshu": 1
- // });
- // k = 1;
- // }
- // else {
- // rowdata_1.push({
- // "HMaterID": data[i].HItemID,
- // "HBarCode": data[i].HBarCode,
- // "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- // "HMaterShortNumber": "",
- // "HMaterName": data[i].鐗╂枡鍚嶇О,
- // "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- // "HMinQty": standardQty,
- // "HBQty": data[i].鏈�灏忓寘瑁呮暟,
- // "HSourceBillType": data[i].鏉＄爜绫诲瀷,
- // "HBatchNo": data[i].鎵瑰彿,
- // "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
- // "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
- // "HKFDQDate": data[i].鏈夋晥鏈�,
- // "HKFDate": data[i].鐢熶骇鏃ユ湡,
- // "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- // "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
- // "HSupName": data[i].渚涘簲鍟嗗悕绉�,
- // "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- // "HQty": standardQty, // 鏈鐢熸垚鏉＄爜鏁伴噺
- // "biaoqianzhangshu": 1
- // });
- // }
+
+ } else {
+ layer.msg(data.Message);
+ }
-
-
- // }
-
- // option_Success.data = rowdata_1;
- // table.render(option_Success);
-
- // }
- // else {
- // // $("#verifycode").click();
- // f_alert(data.Message);
- // }
- // layer.closeAll("loading");
- // },
- // error: function (err) {
- // f_alert("閿欒:" + err);
- // layer.closeAll("loading");
- // }
- //});
- // #endregion
- }
-
- layer.closeAll("loading");
- },
- error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
- return false;
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ return false;
});
//#endregion
--
Gitblit v1.9.1