Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

qq_41295110

9 天以前 d6e2661e7411d2c49b68efa46ad0ddc7520df653

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 .hbuilderx/launch.json

@@ -26,7 +26,7 @@
            "localRepoPath" : "C:/Users/19858/Desktop/智云迈思/APP/STUWMS/unpackage/debug",
            "openVueDevtools" : true,
            "packageName" : "com.iflytek.inputmethod",
            "playground" : "standard",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        }
    ]

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.095",
    "versionCode" : 295,
    "versionName" : "2.096",
    "versionCode" : 296,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue

@@ -545,7 +545,7 @@
            },
            cmdAdd() {
                uni.redirectTo({
                    url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast"
                    url: "./Kf_QCStockInCheckBill_Fast2"
                })
            },
            async cmdSubmit() { // 后端在单次上传文件提交后会删除本地文件，一次只能提交一个数据
@@ -597,7 +597,7 @@
                                if (res.confirm) {
                                    console.log('用户点击确定');
                                    uni.redirectTo({
                                        url: './kf_QCStockInCheckBill_Fast2'
                                        url: '/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2'
                                    })
                                } else if (res.cancel) {
                                    console.log('用户点击取消');

 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue

@@ -703,7 +703,7 @@
                        '&HSourceName=' + this.hform.HSourceName +
                        '&HSourceBillNo=' + this.hform.HSourceBillNo +
                        '&HType=' + item +
                        '&OperationType=4&linterid=&HSouceBillType=7507'
                        '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7507'
                })
            },
            // 源单类型选择

 pages/ZLGL/shoujianjianyan/firstCheckBill.vue

@@ -2146,7 +2146,7 @@
                        '&HSourceName=' + this.hform.HSourceName +
                        '&HSourceBillNo=' + this.hform.HSourceBillNo +
                        '&HType=' + item +
                        '&OperationType=4&linterid=&HSouceBillType=7505'
                        '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7505'
                })
            },
            async auditBill() {

 pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue

@@ -654,7 +654,7 @@
                        '&HSourceName=' + this.hform.HSourceName +
                        '&HSourceBillNo=' + this.hform.HSourceBillNo +
                        '&HType=' + item +
                        '&OperationType=4&linterid=&HSouceBillType=7520'
                        '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7520'
                })
            },
            // 源单类型选择

 pages/baogong/DayPlanBillList.vue

@@ -1,6 +1,6 @@
<template>
    <view class="content">
        <view class="list">
        <view class="list" v-if="currentOrder.length > 0">
            <uni-card :title="'当期订单：'+currentOrder[0].HSourceBillNo" 
            style="margin: 10px;">
                <view class="card-detail">

 pages/baogong/OA_ErrMsgBackBill.vue

@@ -383,6 +383,16 @@
                    HUpDateDate: '',
                    HChecker: '',
                    HCheckDate: '',

                    HICMOInterID: 0,
                    HICMOEntryID: 0,
                    HICMOBillNo: '',

                    HProcExchInterID: 0,
                    HProcExchEntryID: 0,
                    HProcExchBillNo: '',

                    HBarCode: '',
                }
            }
        },
@@ -409,7 +419,15 @@
                this.getMaxNum()
                this.set_Sc_ICMOBillStatus(e.HSourceBillNo, e.HType, e.HSourceName); //回填信息
                this.hform.HContext = e.HType
                this.hform.HBillTypeName = e.HSouceBillType
                this.hform.HBillTypeName = e.HSouceBillType
                this.eData = e
            } else if (this.OperationType == 5) {
                // 检验单跳转
                console.log('e: ', e);
                this.getMaxNum()
                this.set_CheckBillStatus(e.linterid, e.HType, e.HSourceName, e.HSouceBillType, e.HBarCode || ''); //回填信息
                this.hform.HContext = e.HType
                this.hform.HBillTypeName = e.HSouceBillType
                this.eData = e
            }
        },
@@ -421,12 +439,23 @@
            },
            dynamicDesc: {
                get() {
                    return '异常反馈单号:' + this.hform.HBillNo + ',异常类型:' + this.eData.HType + ',订单号:' + this
                        .eData.HICMOBillNo + ',流转卡号:' + this.eData.HICMOBillNo +
                        ', 产品编码:' + this.hform.HMaterNumber + ',产品名称:' + this.hform.HMaterName + ',规格型号:' + this
                        .hform.HMaterModel +
                        ',发送人:' + this.hform.HMaker + ',发生时间:' + this.hform.HDate + ',生产资源:' + this.hform
                        .HSourceName + ',设备编码:' + this.hform.EquipNumber + ',对应处理人:' + this.hform.HHandleEmpName
                    if (this.OperationType == 4) {
                        return '异常反馈单号:' + this.hform.HBillNo + ',异常类型:' + this.eData.HType + ',订单号:' + this
                            .eData.HICMOBillNo + ',流转卡号:' + this.eData.HICMOBillNo +
                            ', 产品编码:' + this.hform.HMaterNumber + ',产品名称:' + this.hform.HMaterName + ',规格型号:' + this
                            .hform.HMaterModel +
                            ',发送人:' + this.hform.HMaker + ',发生时间:' + this.hform.HDate + ',生产资源:' + this.hform
                            .HSourceName + ',设备编码:' + this.hform.EquipNumber + ',对应处理人:' + this.hform.HHandleEmpName
                    }
                    if (this.OperationType == 5) {
                        return '异常反馈单号:' + this.hform.HBillNo + ',异常类型:' + this.eData.HType + ',订单号:' + this
                            .eData.HICMOBillNo + ',流转卡号:' + this.eData.HICMOBillNo +
                            ', 产品编码:' + this.hform.HMaterNumber + ',产品名称:' + this.hform.HMaterName + ',规格型号:' + this
                            .hform.HMaterModel +
                            ',发送人:' + this.hform.HMaker + ',发生时间:' + this.hform.HDate + ',生产资源:' + this.hform
                            .HSourceName + ',设备编码:' + this.hform.EquipNumber + ',对应处理人:' + this.hform.HHandleEmpName
                            + `,检验单号: ${this.hform.HMainSourceBillNo}`
                    }
                }
            }
        },
@@ -845,6 +874,113 @@
                    },
                });
            },
            // 检验单跳转
            async set_CheckBillStatus(HSourceInterID, HType, HSourceName, HSourceBillType, HBarCode) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/getCheckBillStatus',
                        data: {
                            HInterID: HSourceInterID,
                            HBillType: HSourceBillType
                        }
                    })

                    let {
                        data,
                        count,
                        message
                    } = res.data
                    if (count == 1) {
                        this.hform.HMaterNumber = data[0].产品内码 //产品名称
                        this.hform.HMaterName = data[0].产品名称 //产品名称
                        this.hform.HMaterModel = data[0].产品型号 //产品规格
                        this.hform.HMainSourceBillNo = data[0].单据号 //源单单号
                        this.hform.HMainSourceInterID = data[0].hmainid //源单主内码
                        this.hform.HMainSourceEntryID = data[0].hsubid //源单子内码
                        this.hform.HMainSourceBillType = HSourceBillType //源单类型
                        this.hform.HQty = data[0].检验数量 //计划数量
                        this.hform.HSourceID = data[0].HSourceID //生产资源id
                        this.hform.HSourceName = data[0].生产资源名称 //生产资源
                        this.hform.HProcExchBillNo = data[0].工序流转卡号 //源单单号
                        this.hform.HProcExchEntryID = data[0].HProcExchInterID //源单主内码
                        this.hform.HProcExchInterID = data[0].HProcExchEntryID //源单子内码
                        this.hform.HICMOBillNo = data[0].生产订单号
                        this.hform.HICMOInterID = data[0].HICMOInterID
                        this.hform.HICMOEntryID = data[0].HICMOEntryID
                        
                        this.hform.HBarCode = data[0]["条码"] || ''
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `下推异常反馈单失败: ${message}`
                        })
                    }

                    uni.request({
                        url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
                        type: "GET",
                        data: {
                            "TypeName": HType
                        },
                        success: (res) => {
                            var data = res.data.data[0]
                            if (res.data.count == 1) {
                                this.hform.HErrMsgBackTypeID = data.HItemID
                                this.hform.HErrMsgBackTypeName = data.HName
                            } else {
                                uni.showToast({
                                    title: '获取异常类型数据失败',
                                    icon: 'none'
                                })
                            }
                        },
                        fail: (res) => {
                            console.log(res);
                            uni.showToast({
                                title: '获取异常类型失败',
                                icon: 'none'
                            })
                        },
                    });
                    uni.request({
                        url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
                        type: "GET",
                        data: {
                            "HSourceName": HSourceName
                        },
                        success: (res) => {
                            var data = res.data.data[0]
                            console.log(res.data)
                            if (res.data.count == 1) {
                                this.hform.EquipNumber = data.设备编码

                                this.getEquipBindingEmpInfo()
                            } else {
                                uni.showToast({
                                    title: '获取设备编码失败',
                                    icon: 'none'
                                })
                            }
                        },
                        fail: (res) => {
                            console.log(res);
                            uni.showToast({
                                title: '获取设备编码失败',
                                icon: 'none'
                            })
                        },
                    });

                    setTimeout(() => {
                        uni.hideLoading()
                    }, 1000)
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `下推异常反馈单失败: ${err}`
                    })
                }
            },
            //报工台跳转
            set_Sc_ICMOBillStatus(HSourceBill, HType, HSourceName) {
                uni.request({
@@ -1099,7 +1235,7 @@
                    uni.showLoading({
                        title: '请稍候'
                    })
                    if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
                    if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4 || this.OperationType == 5) {
                        this.refSav = "Add";
                    }
                    //若为编辑-保存，则更新修改人和修改时间

 pages/gongxuOut/Cj_StationOutBill_Standard.vue

@@ -121,7 +121,7 @@
                    </checkbox-group>
                </view>
            </view>
            <view class="form-item" v-show="false">
            <view class="form-item" v-show="true">
                <view class="title">开工时间:</view>
                <view class="right">
                     <uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
@@ -129,7 +129,7 @@
                     </uni-datetime-picker>
                </view>
            </view>
            <view class="form-item" v-show="false">
            <view class="form-item" v-show="true">
                <view class="title">完工时间:</view>
                <view class="right">
                     <uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
@@ -666,8 +666,8 @@
            //this.getHMaterList()
            //this.getHProcList()
            //this.getHSupList()
            this.getHSourceList()
            this.getHGroupList()
            //this.getHSourceList()
            //this.getHGroupList()
            this.getHEmpList()
            this.getHCenterList()

@@ -993,7 +993,7 @@
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                title: res.data.msg,
                                icon: 'none'
                            })
                        }