From 4593e30e104a17bebf9f3035b8597cdf4bdc6fed Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 09 九月 2025 19:50:23 +0800
Subject: [PATCH] 条码打印补充
---
WebSRM/WebSRM.csproj.user | 2
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 159 ++++++++++++++++++++++++++++++---------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html | 20 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html | 4 +
4 files changed, 134 insertions(+), 51 deletions(-)
diff --git a/WebSRM/WebSRM.csproj.user b/WebSRM/WebSRM.csproj.user
index 80251cd..9c331f0 100644
--- a/WebSRM/WebSRM.csproj.user
+++ b/WebSRM/WebSRM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\GitHub\SRM-LAYUI-HK\WebSRM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<UseIISExpress>true</UseIISExpress>
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 8b61e0f..bb14d24 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
@@ -411,7 +411,7 @@
}
else if (obj.event == 'inputHMinQty') {
- var oldHMinQty = data.HMinQty;
+ var $input = $(this), val = $input.val();
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
@@ -487,10 +487,13 @@
}
if (HMinQty < HBQty) {
f_alert("鏍囧噯鍖呰鏁伴噺涓嶈兘灏忎簬鏈�灏忓寘瑁呮暟閲�!璇烽噸鏂拌緭鍏ワ紒")
- obj.update({
- HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
- });
return;
+ }
+ else {
+ obj.update({
+ biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
+ });
+
}
break;
}
@@ -584,9 +587,10 @@
var option_Success;
option_Success = {
elem: '#subTable'
- // , url: GetWEBURL() + 'showHBarCodeBillDetail' //h_v_Web_BarCodeBill_ForWeb1
+ // , url: GetWEBURL() + 'showHBarCodeBillDetail' //h_v_Web_BarCodeBill_ForWeb1
, toolbar: '#toolbarDemo1'
, defaultToolbar: ['filter', 'exports']
+ , limit: 500
, cols: [[
, { field: 'HBarCode', title: '鏉＄爜', width: 100 }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
@@ -613,24 +617,24 @@
]]
}
+ //#region ADD
+ var barcodes = data.data;
+
+ // 灏嗘潯鐮佸垪琛ㄨ浆鎹负閫楀彿鍒嗛殧鐨勫瓧绗︿覆
+ var barcodeStr = barcodes.join(',');
$.ajax({
type: "GET",
- url: GetWEBURL() + "/showHBarCodeBillDetail",
- async: true,
- data: { sMsg: lentryid, user: sessionStorage["Organization"] },
+ url: GetWEBURL() + "/GetBarcodeDetails",
+ data: { barcodes: barcodeStr },
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) {
+
+ for (var i = 0; i < data.length; i++) {
+ if (i == data.length - 1)//鏈�鍚庝竴鏉�
+ {
rowdata_1.push({
"HMaterID": data[i].HItemID,
"HBarCode": data[i].HBarCode,
@@ -638,7 +642,7 @@
"HMaterShortNumber": "",
"HMaterName": data[i].鐗╂枡鍚嶇О,
"HMaterModel": data[i].瑙勬牸鍨嬪彿,
- "HMinQty": standardQty ,
+ "HMinQty": data[i].鏍囧噯鍖呰鏁�,
"HBQty": data[i].鏈�灏忓寘瑁呮暟,
"HSourceBillType": data[i].鏉＄爜绫诲瀷,
"HBatchNo": data[i].鎵瑰彿,
@@ -650,10 +654,9 @@
"HSupID": data[i].渚涘簲鍟嗕唬鐮�,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": (totalQty % standardQty), // 鏈鐢熸垚鏉＄爜鏁伴噺
+ "HQty": (data[i].鐢熸垚鏉＄爜鏁伴噺 % data[i].鏍囧噯鍖呰鏁� == 0 ? data[i].鏍囧噯鍖呰鏁�: (data[i].鐢熸垚鏉＄爜鏁伴噺 % data[i].鏍囧噯鍖呰鏁�)), // 鏈鐢熸垚鏉＄爜鏁伴噺
"biaoqianzhangshu": 1
});
- k = 1;
}
else {
rowdata_1.push({
@@ -663,7 +666,7 @@
"HMaterShortNumber": "",
"HMaterName": data[i].鐗╂枡鍚嶇О,
"HMaterModel": data[i].瑙勬牸鍨嬪彿,
- "HMinQty": standardQty,
+ "HMinQty": data[i].鏍囧噯鍖呰鏁�,
"HBQty": data[i].鏈�灏忓寘瑁呮暟,
"HSourceBillType": data[i].鏉＄爜绫诲瀷,
"HBatchNo": data[i].鎵瑰彿,
@@ -675,40 +678,118 @@
"HSupID": data[i].渚涘簲鍟嗕唬鐮�,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": standardQty, // 鏈鐢熸垚鏉＄爜鏁伴噺
+ "HQty": data[i].鏍囧噯鍖呰鏁�, // 鏈鐢熸垚鏉＄爜鏁伴噺
"biaoqianzhangshu": 1
});
}
-
-
-
+
}
+ // 鏇存柊琛ㄦ牸鏁版嵁
option_Success.data = rowdata_1;
table.render(option_Success);
-
}
- else {
- // $("#verifycode").click();
- f_alert(data.Message);
+ }
+ });
+ //#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
+ // });
+ // }
+
+
+
+ // }
+
+ // 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);
- layer.closeAll("loading");
}
});
-
- }
-
- layer.closeAll("loading");
- },
- error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
- return false;
+ return false;
});
//#endregion
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
index 5745644..4fa98d6 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
@@ -653,6 +653,10 @@
function get_createBarCode() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ if (data[0].鏄惁鍚敤 != 'Y') {
+ layer.msg('璇峰厛鍚敤鍐嶇敓鎴愭潯鐮侊紒');
+ return;
+ }
if (checkStatus.data.length) {
//var linterIDArray[0] = data[0].HItemID;
var linterIDArray = []; var BarCodeArr = data[0].HItemID+',';
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
index 069923d..ad9dac1 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -774,9 +774,15 @@
}
}
}
-
+ if (responseData === 2) {
+ layer.msg("鐗╂枡缁勭粐鍜岀櫥褰曠粍缁囦笉涓�鑷达紝璇锋鏌ワ紒");
+ $("#HMaterName").val("");
+ $("#HMaterNumber").val("");
+ $("#HModel").val("");
+ $("#HUSEORGID").val(OrganizationID);
+ return;
+ }
if (responseData === 1) {
- // 寮瑰嚭璇㈤棶妗�
layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾户缁紵', {
icon: 3,
title: '鎻愮ず'
@@ -785,17 +791,9 @@
get_MaterialCheck(1);
});
} else if (responseData.code === "1") {
- // 姝ｅ父杩斿洖鐗╂枡淇℃伅
+
$("#HMaterName").val(responseData.data[0]["HName"]);
$("#HModel").val(responseData.data[0]["HModel"]);
- $("#HUSEORGID").val(responseData.data[0]["HUSEORGID"]);
- if ($("#HUSEORGID").val() != OrganizationID) {
- layer.msg("鐗╂枡缁勭粐鍜岀櫥褰曠粍缁囦笉涓�鑷达紝璇锋鏌ワ紒");
- $("#HMaterName").val("");
- $("#HMaterNumber").val("");
- $("#HModel").val("");
- $("#HUSEORGID").val(OrganizationID);
- }
form.render('select');
} else {
layer.msg(responseData.Message || "鐗╂枡淇℃伅涓嶅瓨鍦�", { time: 5000 });
--
Gitblit v1.9.1