From 21047451b63f532d977bb10eae607cf4f1effb8f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期日, 28 九月 2025 09:47:59 +0800
Subject: [PATCH] 修复 直接调拨 其他入库 无原单多条码 扫码 问题 修复 海诚 条码打印时 多次打印需要重连 条码重复打印问题
---
pages/qitachuku_v2/form.vue | 55 +++++++++++++++++++++++----
pages/shouliaotongzhi/table.vue | 3 +
pages/zhijiediaobo/form.vue | 2
manifest.json | 4 +-
components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue | 4 +-
pages/qitaruku/form.vue | 2 +
pages/xiaoshouchuku/form.vue | 2
pages/qitaruku_v2/form.vue | 16 +++++--
components/labelPrinterComponent/labelPrinterComponent.vue | 4 +-
pages/caigouruku/form.vue | 1
pages/caigoutuiliao/form.vue | 10 ++--
11 files changed, 74 insertions(+), 29 deletions(-)
diff --git a/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue b/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
index 5ea3dbe..3b2a5f4 100644
--- a/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
+++ b/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
@@ -238,11 +238,11 @@
sWhere += ` and 瀹㈡埛 like N'%${this.HCustomer}%'`
}
if (!CommonUtils.isEmpty(this.HSeller)) {
- sWhere += ` and 涓氬姟鍛� like N'%${this.HSeller}%'`
+ sWhere += ` and 閿�鍞憳 like N'%${this.HSeller}%'`
}
CommonUtils.doRequest2({
- url: '/Xs_SeOutStockBill/list',
+ url: '/Xs_SeOutStockBill/list_k3',
data: {
'user': getUserInfo()['Czymc'],
'sWhere': sWhere
diff --git a/components/labelPrinterComponent/labelPrinterComponent.vue b/components/labelPrinterComponent/labelPrinterComponent.vue
index 6a6c1ef..c177e24 100644
--- a/components/labelPrinterComponent/labelPrinterComponent.vue
+++ b/components/labelPrinterComponent/labelPrinterComponent.vue
@@ -105,10 +105,10 @@
let sendSuccess = await this.$refs.bt2.sendMessage(binary);
console.log("鍙戦�佹槸鍚︽垚鍔燂細 ", sendSuccess)
if(sendSuccess === false) {
- return
- }else {
// 鏂紑钃濈墮杩炴帴
this.$refs.bt2.closeBluetooth()
+ return
+ }else {
return uni.showToast({
icon: 'none',
title: '鎵撳嵃鎴愬姛'
diff --git a/manifest.json b/manifest.json
index 23182d5..ffcdfdc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.88",
- "versionCode" : 188,
+ "versionName" : "1.0.90",
+ "versionCode" : 190,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index ccbe6df..e709f02 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -1432,7 +1432,6 @@
url: this.serverUrl + '/WEBSController/set_SavePOStockInBill_Json',
method: 'POST',
dataType: "json",
- timeout: 10000,
data: {
oMain: sMainStr
},
diff --git a/pages/caigoutuiliao/form.vue b/pages/caigoutuiliao/form.vue
index 132e2b5..1cafb26 100644
--- a/pages/caigoutuiliao/form.vue
+++ b/pages/caigoutuiliao/form.vue
@@ -706,7 +706,7 @@
this.hform.HMainSourceBillType = 1102
// this.getHYDList()
} else if (this.HMainSourceBillType == '閲囪喘鍏ュ簱鍗�') {
- this.hform.HMainSourceBillType = 1204
+ this.hform.HMainSourceBillType = 1201
} else {
this.hform.HMainSourceBillType = -1
@@ -1036,9 +1036,9 @@
this.HMainSourceBillType = '閲囪喘璁㈠崟'
this.hform.HMainSourceBillType = 1102
this.showHMainSourceBillType = false
- } else if (data.hSourceBillType == 1204) {
+ } else if (data.hSourceBillType == 1201) {
this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
- this.hform.HMainSourceBillType = 1204
+ this.hform.HMainSourceBillType = 1201
this.showHMainSourceBillType = false
} else {
this.HMainSourceBillType = '鎵嬪伐褰曞叆'
@@ -1266,8 +1266,8 @@
this.hform.HMainSourceBillType = 1102
this.HMainSourceBillType = '閲囪喘璁㈠崟'
this.showHSupName = false
- }else if (data.HSourceBillType == 1204) {
- this.hform.HMainSourceBillType = 1204
+ }else if (data.HSourceBillType == 1201) {
+ this.hform.HMainSourceBillType = 1201
this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
this.showHSupName = false
} else {
diff --git a/pages/qitachuku_v2/form.vue b/pages/qitachuku_v2/form.vue
index e96fff4..3334872 100644
--- a/pages/qitachuku_v2/form.vue
+++ b/pages/qitachuku_v2/form.vue
@@ -364,6 +364,7 @@
HBillerID: uni.getStorageSync('HBillerID'),
HRedBlueFlag: false,
+ SourceFlag: false,
HBarCode: '',
HQty: '',
@@ -415,9 +416,11 @@
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
// this.btnType = 1
+ this.hform.SourceFlag = true
this.RoadBillMain(e.HInterID)
this.refreshBarCodeState()
} else {
+ this.hform.SourceFlag = false
this.getNewData()
this.refreshHSourceBillState()
}
@@ -992,6 +995,7 @@
if (res.data.count == 1) {
var data = res.data.data
console.log(2, data);
+ this.hform.SourceFlag = true
this.hform.HSupName = data.hSupNameField
this.hform.HSupID = data.hSupIDField
if (data.hDeptIDField != 0) {
@@ -1046,8 +1050,8 @@
var sHQty = this.hform.HQty
var sSourceBillNo = this.hform.HSourceBillNo
var sSourceBillType = this.hform.HMainSourceBillType
- var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
- console.log(this.hform.HSourceBillNo, HSourceFlag)
+ // var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+ console.log(this.hform.HSourceBillNo, this.hform.SourceFlag)
if (HDeleteFlag == "*") {
if (sBarCode == "") {
this.playSound(0)
@@ -1108,7 +1112,7 @@
HSPID: sHSPID,
HQty: sHQty,
HRedBlueFlag: this.hform.HRedBlueFlag,
- SourceFlag: HSourceFlag,
+ SourceFlag: this.hform.SourceFlag,
HSourceBillNo: sSourceBillNo,
HSourceBillType: sSourceBillType,
HStockOrgID: this.hform.HStockOrgID,
@@ -1149,8 +1153,9 @@
this.hform.HDeptName = data.hDeptNameField
}
this.hform.HSourceBillNo = data.hSourceBillNoField
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- this.hform.HMainSourceBillType = data.hSourceBillTypeField
+ this.hform.SourceFlag = true
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 婧愬崟绫诲瀷涓虹┖ 鍒� 鍒ゅ畾涓烘墜宸ュ綍鍏�
+ this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
.hSourceBillTypeField)
@@ -1177,10 +1182,42 @@
} else { //鐗╂枡鏉＄爜
this.tabs = 2
if (!this.hform.HSourceBillNo) {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = -1
- this.showHMainSourceBillType = false
- this.showHSourceBillNo = false
+ this.hform.SourceFlag = true
+ this.hform.HSupName = data.hSupNameField
+ this.hform.HSupID = data.hSupIDField
+ this.hform.HSourceBillNo = data.hSourceBillNoField
+ if (data.hDeptIDField != 0) {
+ this.hform.HDeptID = data.hDeptIDField
+ this.hform.HDeptName = data.hDeptNameField
+ }
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 娌℃湁婧愬崟绫诲瀷鍒欓粯璁や负鎵嬪伐褰曞叆
+ this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
+
+ let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+ .hSourceBillTypeField)
+ if (index != -1) {
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+ this.hform.HMainSourceBillType = data.hSourceBillTypeField
+ this.showHMainSourceBillType = false
+ }
+ // if (data.hSourceBillTypeField == "1103") {
+ // this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+ // this.hform.HMainSourceBillType = 1103
+ // this.showHMainSourceBillType = false
+ // } else if (data.hSourceBillTypeField == "1102") {
+ // this.HMainSourceBillType = '閲囪喘璁㈠崟'
+ // this.hform.HMainSourceBillType = 1102
+ // this.showHMainSourceBillType = false
+ // } else {
+ // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ // this.hform.HMainSourceBillType = -1
+ // this.showHMainSourceBillType = false
+ // }
+ if (data.hMulSourceFlagField == 0) {
+ this.showHSourceBillNo = false
+ }
+ //渚涘簲鍟嗕笉鍙紪杈�
+ this.showHSupName = false
}
}
//鏄剧ず琛ㄤ綋鏄庣粏
diff --git a/pages/qitaruku/form.vue b/pages/qitaruku/form.vue
index 3afa7fa..ef21f53 100644
--- a/pages/qitaruku/form.vue
+++ b/pages/qitaruku/form.vue
@@ -346,8 +346,10 @@
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
// this.btnType = 1
+ this.hform.SourceFlag = true
this.RoadBillMain(e.HInterID)
} else {
+ this.hform.SourceFlag = false
this.getNewData()
}
this.getHBaseList()
diff --git a/pages/qitaruku_v2/form.vue b/pages/qitaruku_v2/form.vue
index 0390f3d..4e37446 100644
--- a/pages/qitaruku_v2/form.vue
+++ b/pages/qitaruku_v2/form.vue
@@ -361,7 +361,9 @@
HBillSubType: '',
HBillerID: uni.getStorageSync('HBillerID'),
HRedBlueFlag: false,
-
+
+ SourceFlag: false,
+
HBarCode: '',
HQty: '',
HWHName: getUserInfo().HWHName,
@@ -409,10 +411,12 @@
this.OperationType = e.OperationType
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
+ this.hform.HSourceFlag = true
// this.btnType = 1
this.refreshBarCodeState()
this.RoadBillMain(e.HInterID)
} else {
+ this.hform.HSourceFlag = false
this.getNewData()
this.refreshHSourceBillState()
}
@@ -983,6 +987,7 @@
},
success: (res) => {
if (res.data.count == 1) {
+ this.hform.SourceFlag = true
var data = res.data.data
console.log(2, data);
this.hform.HSupName = data.hSupNameField
@@ -1101,7 +1106,7 @@
HSPID: sHSPID,
HQty: sHQty,
HRedBlueFlag: this.hform.HRedBlueFlag,
- SourceFlag: HSourceFlag,
+ SourceFlag: this.hform.SourceFlag,
HSourceBillNo: sSourceBillNo,
HSourceBillType: sSourceBillType,
HStockOrgID: this.hform.HStockOrgID,
@@ -1137,6 +1142,7 @@
} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
this.hform.HSupName = data.hSupNameField
this.hform.HSupID = data.hSupIDField
+ this.hform.SourceFlag = true
if (data.hDeptIDField != 0) {
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
@@ -1170,6 +1176,7 @@
} else { //鐗╂枡鏉＄爜
this.tabs = 2
if (!this.hform.HSourceBillNo) {
+ this.hform.SourceFlag = true
this.hform.HSupName = data.hSupNameField
this.hform.HSupID = data.hSupIDField
this.hform.HSourceBillNo = data.hSourceBillNoField
@@ -1177,9 +1184,8 @@
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
}
- console.log(data)
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- this.hform.HMainSourceBillType = data.hSourceBillTypeField
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 娌℃湁婧愬崟绫诲瀷鍒欓粯璁や负鎵嬪伐褰曞叆
+ this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
.hSourceBillTypeField)
diff --git a/pages/shouliaotongzhi/table.vue b/pages/shouliaotongzhi/table.vue
index 67b8083..aec0097 100644
--- a/pages/shouliaotongzhi/table.vue
+++ b/pages/shouliaotongzhi/table.vue
@@ -458,7 +458,7 @@
title: '鏃犳墦鍗板唴瀹�!!'
})
}
- console.log(this.printableWaitCache);
+ console.log("PrinterWaitCache", this.printableWaitCache);
let printerOne = {}
let printContent = []
let printInfoBuffer = []
@@ -485,6 +485,7 @@
await this.$nextTick(() => {
this.$refs.labelPrinter.execPrint()
+ this.printableWaitCache = []
})
} catch (e) {
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index e088a59..2baf773 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -408,7 +408,7 @@
enableModule: {
get() {
if (this.hform.HMainSourceBillType == 1402 &&
- /鍏磋揪|鏅轰簯/.test(uni.getStorageSync('Organization'))
+ /鍏磋揪|鏉＄爜娴嬭瘯|鏅轰簯/.test(uni.getStorageSync('Organization'))
) {
return 1
diff --git a/pages/zhijiediaobo/form.vue b/pages/zhijiediaobo/form.vue
index 41d2895..c3d3ef1 100644
--- a/pages/zhijiediaobo/form.vue
+++ b/pages/zhijiediaobo/form.vue
@@ -1559,7 +1559,7 @@
}
console.log(data)
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- this.hform.HMainSourceBillType = data.hSourceBillTypeField
+ this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
.hSourceBillTypeField)
--
Gitblit v1.9.1