打印优化

pages/tag/printNew.vue

@@ -312,7 +312,9 @@
                     is_add: 0
                     is_add: 0
                 });
                 });
 
 
-                this.request(API.checkScTallyGoods, 'POST', { erp_order_sn: this.form.erp_order_sn }, true).then(res => {
+                //特殊处理批次，给验证入仓号接口使用
+                let batch = this.form.batch > 0 ? `-${this.form.batch}` : '';
+                this.request(API.checkScTallyGoods, 'POST', { erp_order_sn: this.form.erp_order_sn + batch }, true).then(res => {
                     if (res.err_code === 0) {
                     if (res.err_code === 0) {
                         this.request(API.checkRepeatPrintLabel, 'POST', params, true).then(res => {
                         this.request(API.checkRepeatPrintLabel, 'POST', params, true).then(res => {
                             if (res.err_code === 0) {
                             if (res.err_code === 0) {

pages/tag/repairPrintNew.vue

@@ -115,8 +115,10 @@
                     });
                     });
                     return false;
                     return false;
                 }
                 }
+                //特殊处理批次，给验证入仓号接口使用
+                let batch = this.form.batch > 0 ? `-${this.form.batch}` : '';
 
 
-                this.request(API.checkScTallyGoods, 'POST', { erp_order_sn: this.form.erp_order_sn }, true).then(res => {
+                this.request(API.checkScTallyGoods, 'POST', { erp_order_sn: this.form.erp_order_sn + batch }, true).then(res => {
                     if (res.err_code === 0) {
                     if (res.err_code === 0) {
                         this.request(API.checkRepeatPrintLabel, 'POST', this.form, true).then(res => {
                         this.request(API.checkRepeatPrintLabel, 'POST', this.form, true).then(res => {
                             if (res.err_code === 0) {
                             if (res.err_code === 0) {

pages/tally/abnormalTally.vue

@@ -571,7 +571,7 @@
                             let text = res.data == 2 ? '已封箱' : '已装板';
                             let text = res.data == 2 ? '已封箱' : '已装板';
                             uni.showModal({
                             uni.showModal({
                                 title: '',
                                 title: '',
-                                content: `该箱状态${text}, 不可操作封箱`,
+                                content: `只有理货中的箱号才可封箱，请重新开箱`,
                                 showCancel: false,
                                 showCancel: false,
                                 success: (res) => {
                                 success: (res) => {
                                     if (res.confirm) {
                                     if (res.confirm) {

pages/tally/index.vue

@@ -868,7 +868,7 @@
                             let text = res.data == 2 ? '已封箱' : '已装板';
                             let text = res.data == 2 ? '已封箱' : '已装板';
                             uni.showModal({
                             uni.showModal({
                                 title: '',
                                 title: '',
-                                content: `该箱状态${text}, 不可操作封箱`,
+                                content: `只有理货中的箱号才可封箱，请重新开箱`,
                                 showCancel: false,
                                 showCancel: false,
                                 success: (res) => {
                                 success: (res) => {
                                     if (res.confirm) {
                                     if (res.confirm) {

pages/tally/unboxing.vue

@@ -287,7 +287,7 @@
                         })
                         })
                         //这里的必须性是为了拿到箱子id
                         //这里的必须性是为了拿到箱子id
                         setTimeout(() => {
                         setTimeout(() => {
-                            this.request(API.getBoxSn, 'POST', { box_sn: box_sn }, true).then(res => {
+                            this.request(API.getBoxSn, 'POST', { box_sn: this.box_sn }, true).then(res => {
                                 if (res.err_code === 0) {
                                 if (res.err_code === 0) {
                                     this.wsty_id = res.data.wsty_id;
                                     this.wsty_id = res.data.wsty_id;
                                     this.is_unboxing = true; //表示开箱成功
                                     this.is_unboxing = true; //表示开箱成功
@@ -821,7 +821,7 @@
                             let text = res.data == 2 ? '已封箱' : '已装板';
                             let text = res.data == 2 ? '已封箱' : '已装板';
                             uni.showModal({
                             uni.showModal({
                                 title: '',
                                 title: '',
-                                content: `该箱状态${text}, 不可操作封箱`,
+                                content: `只有理货中的箱号才可封箱，请重新开箱`,
                                 showCancel: false,
                                 showCancel: false,
                                 success: (res) => {
                                 success: (res) => {
                                     if (res.confirm) {
                                     if (res.confirm) {

util/api.js

-// const API_BASE = 'https://api.ichunt.com';
-// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
-// const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
-// const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 
+const API_BASE = 'https://api.ichunt.com';
+const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
+const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
+const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 
 
 
-const API_BASE = 'http://api.liexin.com';
-const API_BASE_OSS = 'http://image.liexindev.net';
-const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
-const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 
+// const API_BASE = 'http://api.liexin.com';
+// const API_BASE_OSS = 'http://image.liexindev.net';
+// const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
+// const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 
 
 
 
 
 const API = {
 const API = {