From 7372a71c35150a37c4cf1b5e83d96f7f8bc374d3 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 12 九月 2025 17:29:33 +0800
Subject: [PATCH] 销售出库:条码拆分更改为存储过程实现

---
 H5/Js/Xsck.js |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/H5/Js/Xsck.js b/H5/Js/Xsck.js
index ab3e8ff..b699f6b 100644
--- a/H5/Js/Xsck.js
+++ b/H5/Js/Xsck.js
@@ -186,7 +186,7 @@
             }
 
             if (!that.billNo) {
-                this.$toast.fail("鍙戣揣閫氱煡鍗曞彿涓嶈兘涓虹┖");
+                this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
                 that.isLoading = false;
                 return;
             }
@@ -201,7 +201,8 @@
             that.AxiosHttp("post", 'MesXsck/XSCKScanBarcode', {
                 userName: that.userInfo.loginAccount,
                 barcode: that.barcode,
-                daa001: that.billNo,
+                daa001: that.daa001,
+                billNo: that.billNo,
                 //type: selectType
             }, false)
                 .then(function (res) {
@@ -221,8 +222,12 @@
 
                     } else if (json.status == 2) {
                         that.$refs.splitNum.focus();
-                        that.splitNum = json.data.cfNum;
-                        that.num = json.data.num;
+                        that.splitNum = json.data.tbBillList.splitNum; // 鎷嗗垎鏁伴噺
+                        that.num = json.data.tbBillList.barcodeNum;    // 鏉$爜鏁伴噺
+                        that.daa001 = json.data.tbBillList.daa001;     // 宸ュ崟鍙�
+                        if (json.data.tbBillList.billNo) {
+                            that.billNo = json.data.tbBillList.billNo;
+                        }     // 鍙戣揣閫氱煡鍗曞彿锛屽彧鍦ㄦ湁鍊兼椂璧嬪��
                     }
                     else {
                         that.$toast.fail(json.message);
@@ -263,16 +268,16 @@
             }
 
             if (!that.billNo) {
-                this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+                this.$toast.fail("鍙戣揣鍗曞彿涓嶈兘涓虹┖");
                 that.isLoading = false;
                 return;
             }
 
-            if (!that.daa001) {
-                this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
-                that.isLoading = false;
-                return;
-            }
+            //if (!that.daa001) {
+            //    this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+            //    that.isLoading = false;
+            //    return;
+            //}
 
             if (!that.splitNum) {
                 this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
@@ -283,7 +288,8 @@
             that.AxiosHttp("post", 'MesXsck/SplitBarcode', {
                 userName: that.userInfo.loginAccount,
                 barcode: that.barcode,
-                daa001: that.billNo,
+                daa001: that.daa001,
+                billNo: that.billNo,
                 num: that.splitNum,
                 //type: selectType
             }, false)

--
Gitblit v1.9.3