以前的页面部分接口调整

qq_41295110

2025-07-21 3a2dfe59a4ded45f03c3aa30c42f50407029cbe1

以前的页面部分接口调整

 README.md

@@ -26,4 +26,3 @@
添加功能模块:
测试数据：生产领料（MATO00048891）,

	

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.15",
    "versionCode" : 115,
    "versionName" : "1.0.16",
    "versionCode" : 116,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/baogong/list.vue

@@ -120,6 +120,7 @@
                })
            },
            edit(item){
                console.log(item)
                var lists =  ['开工', '汇报', '完工', '停工', '异常反馈']
                this.chooseIt = item
                var upData = {
@@ -218,6 +219,7 @@
                uni.showLoading({
                    title:'请稍后...'
                })
                console.log(upData)
                uni.request({
                    url: this.serverUrl + urls,
                    data:upData,

 pages/baoyangjihua/form.vue

@@ -348,9 +348,9 @@
                    url: this.serverUrl + '/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListCheckDetai', 
                    data: { HID: hmainid },
                    success: (res) => {
                        console.log(res.data.data.h_v_Sb_EquipMaintainPlanBillList[0]);
                        console.log(res.data.data.h_v_Sb_EquipMaintainPlanBill_Edit);
                        if(res.data.code == 1){
                            var data = res.data.data.h_v_Sb_EquipMaintainPlanBillList[0]
                            var data = res.data.data.h_v_Sb_EquipMaintainPlanBill_Edit[0]
                            this.hform = {
                                HInterID:hmainid,
                                HBillNo:data.单据号,

 pages/baoyangjilu/form.vue

@@ -337,9 +337,9 @@
                    url: this.serverUrl + '/Sb_EquipMaintainBill/Sb_EquipMaintainBillListCheckDetai', 
                    data: { HID: hmainid },
                    success: (res) => {
                        console.log(1,res.data.data.h_v_Sb_EquipMaintainBillList[0]);
                        console.log(1,res.data.data.h_v_Sb_EquipMaintainBill_Edit);
                        if(res.data.code == 1){
                            var data = res.data.data.h_v_Sb_EquipMaintainBillList[0]
                            var data = res.data.data.h_v_Sb_EquipMaintainBill_Edit[0]
                            this.hform = {
                                HInterID:hmainid,
                                HBillNo:data.单据号,

 pages/gongxuIn/form.vue

@@ -4,16 +4,32 @@
            <view class="form-item">
                <view class="title"><text>*</text>条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="请扫描条码"/>
                    <input name="HBarCode" v-model="hform.HBarCode" placeholder="请扫描条码"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode(0)"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>配件条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input name="HBarCode_Mater" v-model="hform.HBarCode_Mater" placeholder="请扫描条码"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode(1)"></uni-icons>
            </view>
			
            <view class="tab_area"></view>
			
            <view class="form-item" v-if="showHProcNo">
                <view class="title"><text>*</text>流水号:</view>
                <view class="right" style="width: 380rpx;">
                    <input name="HBarCode" v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号" @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanProcNo"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>当前工序:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHProcName" placeholder="请选择当前工序" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>接收数量:</view>
@@ -51,14 +67,6 @@
                    <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="请输入备注"></textarea>
                </view>
            </view>
            <view class="form-item">
                <view class="title">单据日期:</view>
                <view class="right">
                    <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                        <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                    </picker>
                </view>
            </view>
            
            <view class="tab_area"></view>
            
@@ -69,26 +77,43 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">单据日期:</view>
                <view class="righton">
                    <input name="HDate" disabled v-model="hform.HDate" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产组织:</view>
                <view class="righton">
                    <input v-model="hform.HPRDOrg" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产订单:</view>
                <view class="righton">
                    <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">流转卡:</view>
                <view class="title">订单数量:</view>
                <view class="righton">
                    <input disabled v-model="hform.HProcExchBillNo" />
                    <input name="HICMOQty" disabled v-model="hform.HICMOQty" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">物料代码:</view>
                <view class="title">订单跟踪号:</view>
                <view class="righton">
                    <input v-model="hform.HOrderProcNO" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">产品代码:</view>
                <view class="righton">
                    <input disabled v-model="hform.HMaterNumber" />
                    <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="请选择产品代码" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
                </view>
            </view>
            <view class="form-item">
                <view class="title">物料名称:</view>
                <view class="title">产品名称:</view>
                <view class="righton">
                    <input v-model="hform.HMaterName" disabled />
                </view>
@@ -100,181 +125,33 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">计量单位:</view>
                <view class="title">流转卡号:</view>
                <view class="righton">
                    <input v-model="hform.单位" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">工序:</view>
<!--                 <view class="right">
                    <uni-combox :candidates="arrayHProcName" placeholder="请选择当前工序" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
                </view> -->
                <view class="righton">
                    <input v-model="hform.HProcName" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产组织:</view>
                <view class="righton">
                    <input v-model="hform.HPRDOrg" disabled />
                </view>
            </view>
			
			
<!--             <view class="form-item">
                <view class="title">单据号:</view>
                <view class="righton">
                    <input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="请输入单据号" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">单据日期:</view>
                <view class="righton">
                    <input name="HDate" disabled v-model="hform.HDate" placeholder="请选择" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产组织:</view>
                <view class="right">
                    <input name="HPRDOrg" v-model="hform.HPRDOrg" placeholder="请输入生产组织" />
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>生产订单号:</view>
                <view class="right">
                    <input name="HICMOBillNo" v-model="hform.HICMOBillNo" placeholder="请输入生产订单号" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">订单数量:</view>
                <view class="right">
                    <input name="HICMOQty" v-model="hform.HICMOQty" placeholder="请输入订单数量" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">订单跟踪号:</view>
                <view class="right">
                    <input name="HOrderProcNO" v-model="hform.HOrderProcNO" placeholder="请输入订单跟踪号" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">产品代码:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHMaterNumber" placeholder="请选择产品代码" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">产品名称:</view>
                <view class="right">
                    <input v-model="hform.HMaterName" placeholder="请输入产品名称" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">规格型号:</view>
                <view class="right">
                    <input v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>流转卡号:</view>
                <view class="right">
                    <input v-model="hform.HProcExchBillNo" placeholder="请输入流转卡号" />
                    <input disabled v-model="hform.HProcExchBillNo" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">流转卡数量:</view>
                <view class="right">
                    <input v-model="hform.HPlanQty" placeholder="请输入流转卡数量" />
                <view class="righton">
                    <input disabled v-model="hform.HPlanQty" />
                </view>
            </view>

            <view class="form-item">
                <view class="title"><text>*</text>当前工序:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHProcName" placeholder="请选择当前工序" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">备注:</view>
                <view class="right">
                    <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="请输入备注"></textarea>
                </view>
            </view> -->
<!-- 			
            <view class="tab_area"></view>
			
            <view class="form-item">
                <view class="title">接收件数:</view>
                <view class="right">
                    <input v-model="hform.HPieceQty" placeholder="请输入接收件数" />
                <view class="righton">
                    <input disabled v-model="hform.HPieceQty" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源2:</view>
                <view class="right">
                    <input v-model="hform.HSourceName" placeholder="请输入生产资源" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源3:</view>
                <view class="right">
                    <input v-model="hform.HSourceName" placeholder="请输入生产资源" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源4:</view>
                <view class="right">
                    <input v-model="hform.HSourceName" placeholder="请输入生产资源" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源5:</view>
                <view class="right">
                    <input v-model="hform.HSourceName" placeholder="请输入生产资源" />
                </view>
            </view>

            <view class="form-item">
                <view class="title">进站时间:</view>
                <view class="right">
                     <uni-datetime-picker v-model="hform.HStationInTime">
                         <input disabled v-model="hform.HStationInTime" placeholder="请选择接收时间" />
                     </uni-datetime-picker>
                </view>
            </view> -->

<!--             <view class="form-item">
                <view class="title">操作员:</view>
                <view class="right">
                    <input v-model="hform.HEmp" placeholder="请输入操作员" />
                <view class="righton">
                    <input disabled v-model="hform.HStationInTime" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">部门:</view>
                <view class="right">
                    <input v-model="hform.HDept" placeholder="请输入部门" />
                </view>
            </view> -->
			
            <!-- <view class="tab_area"></view> -->
			
<!--             <view class="form-item">
                <view class="title">选择文件:</view>
                <view class="right">
                    1111
                </view>
            </view> -->
            
            <view class="tab_area"></view>
            
            <view v-if="showmore">
                <view class="form-item">
                    <view class="title">订单跟踪号:</view>
                    <view class="righton">
                        <input v-model="hform.HOrderProcNO" disabled />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">制单人:</view>
                    <view class="righton">
@@ -312,6 +189,19 @@
                    <view class="righton">
                        <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled/>
                        <input v-else v-model="hform.HCheckDate" disabled/>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">作废人:</view>
                    <view class="righton">
                        <input v-model="hform.HCloseMan" disabled/>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">作废日期:</view>
                    <view class="righton">
                        <input v-if="hform.HCloseDate" v-model="hform.HCloseDate.substr(0,10)" disabled/>
                        <input v-else v-model="hform.HCloseDate" disabled/>
                    </view>
                </view>
                <view class="form-item">
@@ -362,9 +252,11 @@
                HBillNo:'',
                btnType:0,//0新增，1修改，2审核，3反审核
                showmore: false,
                OperationType:1,
                
                arrayHMaterNumber:[],//产品
                HMaterNumberList:[],
                showHProcNo:false,
                arrayHProcNo:[],//工序
                HProcNoList:[],
                arrayHProcName:[],//工序
                HProcNameList:[],
                arrayHSourceName:[],//生产资源
@@ -381,90 +273,71 @@
                    HInterID:'',
                    HBillNo:'',
                    HBarCode:'',
                    HBarCode_Mater:'',
					
                    HProcName:'',
                    HProcID:0,
                    HProcNo:'',
                    HQty:'',
                    HSourceName:'',
                    HSourceID:'',		
                    HSourceID:0,		
                    HGroupName:'',
                    HGroupID:'',
                    HGroupID:0,
                    HCenterName:'',
                    HCenterID:'',
                    HCenterID:0,
                    HEmpName:'',
                    HEmpID:'',
                    HEmpID:0,
                    HRemark:'',
                    HDate:getDateTime.dateTimeStr('y-m-d'),
                    
                    HPRDOrg:'',
                    HPRDOrgID:0,
                    HICMOBillNo:'',
                    HProcExchBillNo:'',
                    HICMOInterID:0,
                    HICMOQty:'',
                    HOrderProcNO:'',
                    HMaterNumber:'',
                    HMaterName:'',
                    HMaterID:'',
                    HMaterID:0,
                    HMaterModel:'',
                    单位:'',
                    HProcName:'',
                    HProcID:'',
                    HPRDOrg:'',
                    HOrderProcNO:'',
					
                    // HPRDOrg:'',
                    // HICMOBillNo:'',
                    // HICMOInterID:'',
                    // HICMOQty:'',
                    // HOrderProcNO:'',
                    // HMaterNumber:'',
                    // HMaterName:'',
                    // HMaterID:'',
                    // HMaterModel:'',
                    // HProcExchBillNo:'',
                    // HProcExchHinteID:'',
                    // HProcName:'',
                    // HProcID:'',
                    // HPlanQty:'',
                    // HWWWorkOrderBillNo:'',
                    // HPieceQty:'',
                    // HWasterQty:'',
                    // HTaxRate:'',
                    // HPrice:'',
                    // HMoney:'',
                    // HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    // // HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    // HSendBillNo:'',
                    // HInnerBillNo:'',
                    // HEmp:'',
                    // HEmpID:'',
                    // HDept:'',
                    // HDeptID:'',		
                    HProcExchBillNo:'',
                    HProcExchHinteID:0,
                    HPlanQty:'',
                    HPieceQty:'',
                    HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
                        
                    HMaker:'',
                    HMakeDate:'',
                    HMaker:uni.getStorageSync('HUserName'),
                    HMakeDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    HUpDater:'',
                    HUpDateDate:'',        
                    HChecker:'',
                    HCheckDate:'',
                    // HCloseMan:'',
                    // HCloseDate:'',		
                    HCloseMan:'',
                    HCloseDate:'',		
                    HDeleteMan:'',
                    HDeleteDate:'',
                    
                    eventType:'Add',
                    HMainInterID:0,
                    lngICMOEntryID:'',
                }
            }
        },
        onLoad(e) {
            // this.getEditData('981','000000000894')
            console.log(e,this.userInfo)
            // this.hform.HEmpID = this.userInfo.Czybm
            // this.hform.HEmp = uni.getStorageSync('HUserName')
            this.hform.HMaker = uni.getStorageSync('HUserName')
            if(e.linterid){
                this.btnType = 1
                this.OperationType = 4
                this.linterid = e.linterid
                this.HBillNo = e.HBillNo
                this.getEditData(e.linterid,e.HBillNo)
            }else{
                this.getNewData()
            }
            this.getHMaterList()
            this.getBaseData()
            this.getHProcList()
            this.getHSourceList()
            this.getHGroupList()
@@ -473,48 +346,60 @@
        },
        methods: {
            //扫码
            toScanCode(){
                // this.hform.HBarCode = 'GXLX00001105'
                // this.getHBarCodeData('GXLX00001105')
            toScanCode(e){
                // this.hform.HBarCode = 'GXLX250603001-01'
                // this.getHBarCodeData('GXLX250603001-01')
				
                uni.scanCode({
                    onlyFromCamera: true,
                    success: (res) => {
                        console.log('条码内容：' + res.result);
                        this.hform.HBarCode = res.result
                        this.getHBarCodeData(res.result)
                        if(e==0){
                            this.hform.HBarCode = res.result
                            this.getHBarCodeData(res.result)
                        }else{
                            this.hform.HBarCode_Mater = res.result
                            this.getHBarCodeMater(res.result)
                        }
                    }
                });
            },
            //扫流水号
            toScanProcNo(){
                uni.scanCode({
                    onlyFromCamera: true,
                    success: (res) => {
                        console.log('条码内容：' + res.result);
                        this.hform.HProcNo = res.result
                        this.getHProcNoData(this.hform.HBarCode,res.result)
                    }
                });
                if(this.hform.HProcExchHinteID){
                    uni.scanCode({
                        onlyFromCamera: true,
                        success: (res) => {
                            console.log('条码内容：' + res.result);
                            this.hform.HProcNo = res.result
                            this.getHProcNoData(this.hform.HBarCode,res.result)
                        }
                    });
                }else{
                    uni.showToast({
                        title:'请扫完流转卡后再扫配件码',
                        icon:'none'
                    })
                }
            },
            //日期
            HDateChange(e){
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
			
            //获取产品数据
            getHMaterList(){
                var Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
            //通过登录用户获取默认值
            getBaseData(){
                uni.request({
                    url: this.serverUrl + '/Web/GetMaterialList_Json', 
                    data: { sWhere: Value },
                    success: (res) => {
                    url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser', 
                    data: { Czybm:this.userInfo.Czybm,Czymc:this.userInfo.Czymc },
                    success: (res) => {
                        console.log('base:', res.data)
                        if(res.data.count == 1){
                            this.HMaterNumberList = res.data.data
                            for(var i=0;i<res.data.data.length;i++){
                                this.arrayHMaterNumber[i] = res.data.data[i].HNumber
                            }
                            this.$forceUpdate();
                            var data = res.data.data[0]
                            this.hform.HSourceID = data.HSourceID
                            this.hform.HSourceName = data.生产资源名称
                            this.hform.HGroupID = data.HGroupID
                            this.hform.HGroupName = data.生产班组名称
                            this.hform.HCenterID = data.HWorkCenterID
                            this.hform.HCenterName = data.工作中心名称
                            this.hform.HEmpID = data.HEmpID
                            this.hform.HEmpNumber = data.操作员代码
                            this.hform.HEmpName = data.操作员名称
                        }else{
                            uni.showToast({
                                title:res.data.Message,
@@ -531,17 +416,45 @@
                    },
                });
            },
            //选择产品数据
            HMaterNumberChange(e){
                for(var i=0;i<this.HMaterNumberList.length;i++){
                    if(this.HMaterNumberList[i].HNumber == e){
                        this.hform.HMaterName = this.HMaterNumberList[i].HName
                        this.hform.HMaterID = this.HMaterNumberList[i].HItemID
                    }
                }
            //日期
            HDateChange(e){
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            //工序
            //流水号
            getHProcNoList(){
                uni.request({
                    url: this.serverUrl + '/Web/GetProcNoList', 
                    data: { sWhere: '',HInterID:this.hform.HProcExchHinteID,UserID:this.userInfo.Czybm },
                    success: (res) => {
                        if(res.data.count == 1){
                            this.HProcNoList = res.data.data
                            for(var i=0;i<res.data.data.length;i++){
                                this.arrayHProcNo[i] = res.data.data[i].流水号
                            }
                        }else{
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title:'接口请求失败',
                            icon:'none'
                        })
                    },
                });
            },
            //选择流水号
            HProcNoChange(e){
                this.hform.HProcNo = e
                this.getHProcNoData(this.hform.HBarCode,e)
            },
            getHProcList(){
                //工序
                uni.request({
                    url: this.serverUrl + '/Web/GetProcList_Json', 
                    data: { sWhere: '' },
@@ -735,6 +648,7 @@
                        console.log(res)
                        if(res.data.count == 1){
                            this.isEdit = true
                            this.OperationType = 3
                            this.hform.eventType = 'Modify'
                        }else{
                            uni.showToast({
@@ -811,11 +725,12 @@
            },
            getHBarCodeData(HBarCode){
                uni.request({
                    url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown', 
                    data: {HBarCode: HBarCode},
                    url: this.serverUrl + '/Cj_StationBill/txtHBarCode_KeyDown2', 
                    // url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
                    data: {HBarCode: HBarCode,HInterID:this.hform.HProcExchHinteID,UserID:this.userInfo.Czybm,HBillType:"In"},
                    success: (res) => {
                        console.log(2,res.data);
                        if(res.data.code == 1){
                        if(res.data.count == 1){
                            var data = res.data.data[0]
                            this.hform.HICMOInterID= data.hicmointerid
                            this.hform.lngICMOEntryID= data.lngICMOEntryID
@@ -824,7 +739,6 @@
                            this.hform.HMaterName= data.产品
                            this.hform.HMaterNumber= data.产品代码
                            this.hform.HMaterModel= data.规格型号
                            this.hform.单位= data.单位
                            this.hform.HPieceQty= data.流转卡数量
                            this.hform.HPlanQty= data.流转卡数量
                            this.hform.HProcExchBillNo= data.单据号
@@ -833,6 +747,33 @@
                            this.hform.lngBillKey= data.hmainid
                            this.hform.HOrderProcNO= data.订单跟踪号
                            this.hform.HPRDOrg= data.组织
                            this.hform.HPRDOrgID= data.组织
                            // this.getHProcNoList()
                            this.showHProcNo = true
                            //自动匹配流水号
                            uni.request({
                                url: this.serverUrl + '/Sc_StationInBill/autoGetProcNo', 
                                data: {HInterID:data.hmainid,HUserID:this.userInfo.Czybm,BillType:"In" },
                                success: (res1) => {
                                    console.log(res1)
                                    if(res1.data.count == 1){
                                        var data1 = res1.data.data[0]
                                        this.hform.lngBillSubKey= data1.hsubid
                                        this.hform.HProcName= data1.工序
                                        this.hform.HProcID= data1.工序ID
                                        this.hform.HProcNo= data1.流水号
                                        this.hform.HCenterName= data1.工作中心
                                        this.hform.HCenterID= data1.HCenterID
                                    }
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.showToast({
                                        title:'接口请求失败',
                                        icon:'none'
                                    })
                                },
                            });
                        }else{
                            uni.showToast({
                                title:res.data.Message,
@@ -849,19 +790,57 @@
                    },
                });
            },
            getHBarCodeMater(HBarCode){
                uni.request({
                    url: this.serverUrl + '/Cj_StationBill/txtHBarCode_Mater_KeyDown', 
                    data: {HBarCode: HBarCode},
                    success: (res) => {
                        uni.showToast({
                            title:res.data.Message,
                            icon:'none'
                        })
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title:'接口请求失败',
                            icon:'none'
                        })
                    },
                });
            },
            getHProcNoData(HBarCode,HProcNo){
                uni.request({
                    url: this.serverUrl + '/Cj_StationInBill/txtHProcNo_KeyDown', 
                    data: {sBillNo: HBarCode,sProcNo: HProcNo},
                    success: (res) => {
                        console.log(3,res);
                        if(res.data.code == 1){
                        if(res.data.count == 1){
                            var data = res.data.data[0]
                            this.hform.lngBillSubKey= data.hsubid
                            this.hform.HProcName= data.工序
                            this.hform.HProcID= data.HProcID
                            this.hform.HCenterName= data.工作中心
                            this.hform.HCenterID= data.HCenterID
							
                            uni.request({
                                url: this.serverUrl + '/Cj_StationInBill/MES_StationInBillSubBindSource', 
                                data: {HInterID:this.hform.HProcExchHinteID,HProcExchInterID:this.hform.lngBillKey,HProcExchEntryID:this.hform.lngBillSubKey },
                                success: (res1) => {
                                    console.log(res1)
                                    uni.showToast({
                                        title:res1.data.Message,
                                        icon:'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.showToast({
                                        title:'接口请求失败',
                                        icon:'none'
                                    })
                                },
                            });
                        }else{
                            uni.showToast({
                                title:res.data.Message,
@@ -935,8 +914,7 @@
                        title:'请稍候'
                    })
                    var sMainStr = JSON.stringify(this.hform);
                    var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
                    console.log(sMainSub);
                    var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.OperationType;
                    uni.request({
                        url: this.serverUrl + '/Cj_StationInBill/AddBill',
                        method:'POST',
@@ -985,6 +963,7 @@
                    data:{ 
                        CurUserName: uni.getStorageSync('HUserName'),
                        HInterID: this.linterid,
                        HBillSubType:'3792',
                    },
                    success: (res) => {
                        console.log(1,res);
@@ -1033,6 +1012,7 @@
                    data:{ 
                        CurUserName: uni.getStorageSync('HUserName'),
                        HInterID: this.linterid,
                        HBillSubType:'3792',
                    },
                    success: (res) => {
                        console.log(1,res);

 pages/gongxuIn/table.vue

@@ -273,7 +273,8 @@
                    url: this.serverUrl + '/Cj_StationInBill/get_Display',
                    data:{ 
                        sWhere: this.sWhere,
                        user: uni.getStorageSync('HUserName')
                        user: uni.getStorageSync('HUserName'),
                        HBillSubType:'3790',
                    },
                    success: (res) => {
                        // console.log(1,res.data.data);

 pages/gongxuOut/form.vue

@@ -426,6 +426,7 @@
                HBillNo:'',
                btnType:0,//0新增，1修改，2审核，3反审核
                FirstEndHProcNo:0,//默认0  首道工序1 末道工序2
                OperationType:1,
                showmore: false,
                
                arrayHMaterNumber:[],//产品
@@ -453,13 +454,13 @@
                    HPieceQty:'',
                    HWasterQty:'',
                    HSourceName:'',
                    HSourceID:'',
                    HSourceID:0,
                    HCenterName:'',
                    HCenterID:'',
                    HCenterID:0,
                    HGroupName:'',
                    HGroupID:'',
                    HGroupID:0,
                    HEmpName:'',
                    HEmpID:'',
                    HEmpID:0,
                    HRemark:'',
                    HDate:getDateTime.dateTimeStr('y-m-d'),
                    
@@ -467,7 +468,7 @@
                    HProcExchBillNo:'',
                    HMaterNumber:'',
                    HMaterName:'',
                    HMaterID:'',
                    HMaterID:0,
                    HMaterModel:'',
                    单位:'',
                    HProcName:'',
@@ -497,7 +498,7 @@
                    // HTaxRate:'',
                    // HPrice:'',
                    // HMoney:'',
                    // // HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    HStationInTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    // HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    // HSendBillNo:'',
                    // HInnerBillNo:'',
@@ -519,8 +520,8 @@
                    // HPayProcID:'',
                    // HSourceNameList:'',
                        
                    HMaker:'',
                    HMakeDate:'',
                    HMaker:uni.getStorageSync('HUserName'),
                    HMakeDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
                    HUpDater:'',
                    HUpDateDate:'',        
                    HChecker:'',
@@ -545,6 +546,7 @@
            // this.hform.HStationOutTime = getDateTime.dateTimeStr('y-m-d h:i:s')
            if(e.linterid){
                this.btnType = 1
                this.OperationType = 4
                this.linterid = e.linterid
                this.HBillNo = e.HBillNo
                this.getEditData(e.linterid,e.HBillNo)
@@ -1003,6 +1005,7 @@
                        console.log(res)
                        if(res.data.count == 1){
                            this.isEdit = true
                            this.OperationType = 3
                            this.hform.eventType = 'Modify'
                        }else{
                            uni.showToast({
@@ -1219,7 +1222,7 @@
                        title:'请稍候'
                    })
                    var sMainStr = JSON.stringify(this.hform);
                    var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
                    var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.OperationType;
                    console.log(sMainSub);
                    uni.request({
                        url: this.serverUrl + '/Cj_StationOutBill/AddBill',
@@ -1280,6 +1283,7 @@
                    data:{ 
                        CurUserName: uni.getStorageSync('HUserName'),
                        HInterID: this.linterid,
                        HBillSubType:'',
                    },
                    success: (res) => {
                        console.log(1,res);
@@ -1328,6 +1332,7 @@
                    data:{ 
                        CurUserName: uni.getStorageSync('HUserName'),
                        HInterID: this.linterid,
                        HBillSubType:'',
                    },
                    success: (res) => {
                        console.log(1,res);

 pages/gongxuOut/table.vue

@@ -214,7 +214,7 @@
                <view class="op" v-if="operations == index">
<!--                     <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">工序检</button>
                    <!-- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">工序检</button> -->
                    <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button>
                    <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button>
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
@@ -295,7 +295,8 @@
                    url: this.serverUrl + '/Cj_StationOutBill/get_Display',
                    data:{ 
                        sWhere: this.sWhere,
                        user: uni.getStorageSync('HUserName')
                        user: uni.getStorageSync('HUserName'),
                        HBillSubType:'',
                    },
                    success: (res) => {
                        // console.log(1,res.data.data);

 pages/shebeidangan/form.vue

@@ -108,7 +108,7 @@
            <view class="tab_area"></view>
            
            <view class="form-item">
                <view class="title"><text>*</text>对应ERP物料:</view>
                <view class="title">对应ERP物料:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHMaterNumber" placeholder="请选择对应ERP物料" v-model="hform.HName" @input="HMaterNumberChange"></uni-combox>
                </view>
@@ -309,25 +309,25 @@
                    HEquipDotCheckRuleInterName:'',
                    HEquipDotCheckRuleInterID:0,
                    HSourceName:'',
                    HSourceID:'',
                    HSourceID:0,
                    
                    HMaterNumber:'',
                    HMaterID:'',
                    HMaterID:0,
                    HEquipFileTypeName:'',
                    HEquipFileTypeID:'',
                    HEquipFileTypeID:0,
                    HUnitName:'',
                    HUnitID:'',
                    HUnitID:0,
                    HSellSupName:'',
                    HSellSupID:'',
                    HSellSupID:0,
                    
                    HDeptName:'',
                    HDeptID:'',
                    HDeptID:0,
                    HUseEmpName:'',
                    HUseEmpID:'',
                    HUseEmpID:0,
                    HRepairEmpName:'',
                    HRepairEmpID:'',
                    HRepairEmpID:0,
                    HMakeSupName:'',
                    HMakeSupID:'',
                    HMakeSupID:0,
                    
                    HOutComDate:'',
                    HAddress:'',
@@ -822,29 +822,29 @@
                                HModel2:data.设备型号,
                                
                                HEquipMaintainRuleInterName:data.默认保养规程,
                                HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID,
                                HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID||0,
                                HEquipDotCheckRuleInterName:data.默认点检规程,
                                HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID,
                                HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID||0,
                                HSourceName:data.HSourceName,
                                HSourceID:data.HSourceID,
                                HSourceID:data.HSourceID||0,
                                
                                HMaterNumber:data.物料名称,
                                HMaterID:data.HMaterID,
                                HMaterID:data.HMaterID||0,
                                HEquipFileTypeName:data.设备类型,
                                HEquipFileTypeID:data.HEquipFileTypeID,
                                HEquipFileTypeID:data.HEquipFileTypeID||0,
                                HUnitName:data.单位,
                                HUnitID:data.HUnitID,
                                HUnitID:data.HUnitID||0,
                                HSellSupName:data.供应商,
                                HSellSupID:data.HSellSupID,
                                HSellSupID:data.HSellSupID||0,
                                
                                HDeptName:data.使用部门,
                                HDeptID:data.HDeptID,
                                HDeptID:data.HDeptID||0,
                                HUseEmpName:data.使用负责人,
                                HUseEmpID:data.HUseEmpID,
                                HUseEmpID:data.HUseEmpID||0,
                                HRepairEmpName:data.维护负责人,
                                HRepairEmpID:data.HRepairEmpID,
                                HRepairEmpID:data.HRepairEmpID||0,
                                HMakeSupName:data.制造商,
                                HMakeSupID:data.HMakeSupID,
                                HMakeSupID:data.HMakeSupID||0,
                                
                                HOutComDate:data.设备出厂日期.substr(0,10),
                                HAddress:data.安装地点,
@@ -945,11 +945,6 @@
                }else if(!this.hform.HEquipFileNumber){
                    uni.showToast({
                        title:'请输入设备代码',
                        icon:'none'
                    })
                }else if(!this.hform.HMaterID){
                    uni.showToast({
                        title:'请选择对应ERP物料',
                        icon:'none'
                    })
                }else if(!this.hform.HEquipFileTypeID){

 pages/shebeiweixiu/form.vue

@@ -403,9 +403,9 @@
                    url: this.serverUrl + '/Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListCheckDetai', 
                    data: { HID: hmainid },
                    success: (res) => {
                        console.log(1,res.data.data.h_v_Sb_EquipRepairWorkBillList[0]);
                        console.log(1,res.data.data.h_v_Sb_EquipRepairWorkBill_Edit);
                        if(res.data.code == 1){
                            var data = res.data.data.h_v_Sb_EquipRepairWorkBillList[0]
                            var data = res.data.data.h_v_Sb_EquipRepairWorkBill_Edit[0]
                            this.hform = {
                                HInterID:hmainid,
                                HBillNo:data.单据号,
@@ -453,11 +453,11 @@
                //子表
                uni.request({
                    url: this.serverUrl + '/Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListProjectDetai', 
                    data: { "sqlWhere": "and hmainid=" + hmainid },
                    data: { HInterID: hmainid },
                    success: (res) => {
                        console.log(2,res.data.list);
                        if(res.data.count == 1){
                            this.form1List = res.data.data
                            console.log(2,res.data.data);
                            this.form1List = res.data.list
                        }else{
                            uni.showToast({
                                title:res.data.Message,

 pages/shebeiweixiu/form1.vue

@@ -104,6 +104,7 @@
            this.getHConkReasonList()
            this.getHManagerNameList()
            this.hformList = this.form1List
            console.log(this.hformList)
        },
        methods: {
            //维修项目

 pages/weiwaigxIn/form.vue

@@ -402,8 +402,8 @@
        methods: {
            //扫码
            toScanCode(){
                // this.hform.HBarCode = 'GXLX00000967'
                // this.getHBarCodeData('GXLX00000967')
                // this.hform.HBarCode = 'OP000021_01'
                // this.getHBarCodeData('OP000021_01')
                uni.scanCode({
                    onlyFromCamera: true,
                    success: (res) => {
@@ -688,7 +688,7 @@
                    url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown', 
                    data: {HBarCode: HBarCode},
                    success: (res) => {
                        console.log(2,res.data.data[0]);
                        console.log(2,res.data);
                        if(res.data.code == 1){
                            var data = res.data.data[0]
                            this.hform.HICMOBillNo= data.任务单号

 pages/weiwaigxIn/table.vue

@@ -244,7 +244,7 @@
                    url: this.serverUrl + '/Cj_StationEntrustInBill/list',
                    data:{ 
                        sWhere: this.sWhere,
                        user: uni.getStorageSync('HUserName')
                        user: uni.getStorageSync('HUserName'),
                    },
                    success: (res) => {
                        console.log(1,res.data.data);

 pages/weiwaigxOut/form.vue

@@ -58,6 +58,12 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>生产班组:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHGroupName" placeholder="请选择生产班组" v-model="hform.HGroupName" @input="HGroupNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">备注:</view>
                <view class="right">
                    <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="请输入备注"></textarea>
@@ -344,6 +350,8 @@
                HSupNameList:[],
                arrayHEmpName:[],//操作员
                HEmpNameList:[],
                arrayHGroupName:[],//班组
                HGroupNameList:[],
                
                isEdit: false,
                hform:{
@@ -400,8 +408,8 @@
                    // HEmpID:'',
                    // HSource:'',
                    // HSourceID:'',        
                    // HGroup:'',
                    // HGroupID:'',
                    HGroupName:'',
                    HGroupID:0,
                    // HDept:'',
                    // HDeptID:'',        
                        
@@ -434,6 +442,7 @@
            }else{
                this.getNewData()
            }
            this.getHGroupList()
            this.getHMaterList()
            this.getHProcList()
            this.getHSupList()
@@ -442,16 +451,16 @@
        methods: {
            //扫码
            toScanCode(){
                // this.hform.HBarCode = 'GXLX00000967'
                // this.getHBarCodeData('GXLX00000967')
                uni.scanCode({
                    onlyFromCamera: true,
                    success: (res) => {
                        console.log('条码内容：' + res.result);
                        this.hform.HBarCode = res.result
                        this.getHBarCodeData(res.result)
                    }
                });
                this.hform.HBarCode = 'OP000021_01'
                this.getHBarCodeData('OP000021_01')
                // uni.scanCode({
                //     onlyFromCamera: true,
                //     success: (res) => {
                //         console.log('条码内容：' + res.result);
                //         this.hform.HBarCode = res.result
                //         this.getHBarCodeData(res.result)
                //     }
                // });
            },
            //扫流水号
            toScanProcNo(){
@@ -612,6 +621,7 @@
                        })
                    },
                });
				
            },
            //选择接收人
            HEmpNameChange(e){
@@ -619,6 +629,43 @@
                    if(this.HEmpNameList[i].HName == e){
                        this.hform.HEmpID = this.HEmpNameList[i].HItemID
                        this.hform.HQCCheckID = this.HEmpNameList[i].HItemID
                    }
                }
            },
            //生产班组
            getHGroupList(){
                uni.request({
                    url: this.serverUrl + '/Web/GetProductionTeamList_Json', 
                    data: { sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + "" },
                    success: (res) => {
                        if(res.data.count == 1){
                            this.HGroupNameList = res.data.data
                            for(var i=0;i<res.data.data.length;i++){
                                this.arrayHGroupName[i] = res.data.data[i].班组
                            }
                            this.$forceUpdate();
                        }else{
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title:'接口请求失败',
                            icon:'none'
                        })
                    },
                });
            },
            //选择生产班组
            HGroupNameChange(e){
                for(var i=0;i<this.HGroupNameList.length;i++){
                    if(this.HGroupNameList[i].班组 == e){
                        this.hform.HGroupName = this.HGroupNameList[i].班组
                        this.hform.HGroupID = this.HGroupNameList[i].HItemID
                    }
                }
            },
@@ -754,7 +801,7 @@
                            this.hform.HSourceID= data.HSourceID
                            this.hform.HSource= data.生产资源
                            this.hform.HGroupID= data.HGroupID
                            this.hform.HGroup= data.班组
                            this.hform.HGroupName= data.班组
                            this.hform.HDeptID= this.userInfo.HDeptID
                            this.hform.HDept= this.userInfo.HDept
                            this.hform.HProcExchHinteID= data.hmainid

 pages/weiwaigxOut/table.vue

@@ -287,7 +287,7 @@
                        user: uni.getStorageSync('HUserName')
                    },
                    success: (res) => {
                        // console.log(1,res);
                        console.log(1,res);
                        if(res.data.count == 1){
                            this.listData = res.data.data
                            this.showList = this.getPage(this.page,this.listData)