From 546cc7332eb8cc989bdb686db907b1b7f77d5240 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 09 九月 2025 14:07:10 +0800
Subject: [PATCH] 条码打印生成，物料校验
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 73 ++++++++++++++++++------------------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html | 12 +-----
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html | 5 ++
3 files changed, 43 insertions(+), 47 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 a95613d..8b61e0f 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
@@ -617,20 +617,20 @@
type: "GET",
url: GetWEBURL() + "/showHBarCodeBillDetail",
async: true,
- data: { sMsg: lentryid },
+ 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 = [];
-
- for (var i = 0; i < data.length; i++) {
- var totalQty = data[i].鐢熸垚鏉＄爜鏁伴噺; // 鎬绘潯鐮佹暟
- var standardQty = data[i].鏍囧噯鍖呰鏁�; // 鏍囧噯鍖呰鏁�
- var labelCount = Math.ceil(totalQty / standardQty); // 璁＄畻鏍囩鏁�
-
- // 鐢熸垚鍓峮-1涓爣鍑嗘爣绛�
- for (var j = 0; j < labelCount - 1; j++) {
+ 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,
@@ -638,7 +638,7 @@
"HMaterShortNumber": "",
"HMaterName": data[i].鐗╂枡鍚嶇О,
"HMaterModel": data[i].瑙勬牸鍨嬪彿,
- "HMinQty": standardQty,
+ "HMinQty": standardQty ,
"HBQty": data[i].鏈�灏忓寘瑁呮暟,
"HSourceBillType": data[i].鏉＄爜绫诲瀷,
"HBatchNo": data[i].鎵瑰彿,
@@ -650,37 +650,38 @@
"HSupID": data[i].渚涘簲鍟嗕唬鐮�,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": standardQty, // 鏍囧噯鍖呰鏁�
+ "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
});
}
- // 鐢熸垚鏈�鍚庝竴涓爣绛撅紙浣欐暟锛�
- var lastQty = totalQty % standardQty;
- if (lastQty === 0) lastQty = standardQty; // 濡傛灉鏁撮櫎锛屾渶鍚庝竴涓篃鏄爣鍑嗗寘瑁呮暟
- 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": lastQty, // 鏈�鍚庝竴涓爣绛剧殑鏁伴噺
- "biaoqianzhangshu": 1
- });
+
}
option_Success.data = rowdata_1;
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 1c2839c..5745644 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
@@ -661,7 +661,8 @@
linterIDArray[i] = data[i].HItemID;
BarCodeArr = BarCodeArr + linterIDArray[i] + ',';
}
- BarCodeArr = BarCodeArr.substring(0, BarCodeArr.length-1);
+
+ BarCodeArr = BarCodeArr.substring(0, BarCodeArr.length - 1);
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -679,6 +680,8 @@
layer.msg('鑷冲皯閫夋嫨涓�琛屾暟鎹紒');
}
}
+
+
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 cdd6be6..069923d 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
@@ -77,7 +77,7 @@
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;">
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;">
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheck" id="btnCheck" style="width: 40px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheck" id="btnCheck" style="width: 70px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;">鏍￠獙</i>
</button>
</div>
@@ -790,19 +790,11 @@
$("#HModel").val(responseData.data[0]["HModel"]);
$("#HUSEORGID").val(responseData.data[0]["HUSEORGID"]);
if ($("#HUSEORGID").val() != OrganizationID) {
- layer.confirm('鐗╂枡缁勭粐鍜屼娇鐢ㄧ粍缁囦笉涓�鑷达紝鏄惁缁х画锛�', {
- btn: ['纭畾', '鍙栨秷']
- }, function (index) {
- layer.close(index);
-
- }, function (index) {
-
- layer.close(index);
+ layer.msg("鐗╂枡缁勭粐鍜岀櫥褰曠粍缁囦笉涓�鑷达紝璇锋鏌ワ紒");
$("#HMaterName").val("");
$("#HMaterNumber").val("");
$("#HModel").val("");
$("#HUSEORGID").val(OrganizationID);
- });
}
form.render('select');
} else {
--
Gitblit v1.9.1