修复 直接调拨 其他入库 无原单多条码 扫码 问题
修复 海诚 条码打印时 多次打印需要重连 条码重复打印问题
11个文件已修改
103 ■■■■ 已修改文件
components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/labelPrinterComponent/labelPrinterComponent.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigouruku/form.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigoutuiliao/form.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitachuku_v2/form.vue 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitaruku/form.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitaruku_v2/form.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shouliaotongzhi/table.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/xiaoshouchuku/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zhijiediaobo/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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: '打印成功'
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" : {
pages/caigouruku/form.vue
@@ -1432,7 +1432,6 @@
                            url: this.serverUrl + '/WEBSController/set_SavePOStockInBill_Json',
                            method: 'POST',
                            dataType: "json",
                            timeout: 10000,
                            data: {
                                oMain: sMainStr
                            },
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 {
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
                                    }
                                }
                                //显示表体明细
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()
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)
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) {
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
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)