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 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 36 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].鐗╂枡浠g爜,
+                                                        "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].鐗╂枡浠g爜,
-                                                    "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;

--
Gitblit v1.9.1