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

chenhaozhe

2025-07-31 9524c6b64cab121b6acb36b24e479ff29de07af0

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

# Conflicts:
#	manifest.json

 pages/weiwaigxOut/form.vue

@@ -4,7 +4,7 @@
            <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="请扫描条码" @confirm="toInCode(e)"/>
                </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>
            </view>
@@ -358,7 +358,7 @@
                    HInterID:'',
                    HBillNo:'',
                    HBarCode:'',
                    HQty:'',
                    HQty:0,
                    HPieceQty:0,
                    HWasterQty:0,
                    HEmpName:'',
@@ -375,10 +375,10 @@
                    HMaterID:0,
                    HMaterModel:'',
                    HSupName:'',
                    HSupID:'',
                    HSupID:0,
                    单位:'',
                    HProcName:'',
                    HProcID:'',
                    HProcID:0,
                    HPRDOrg:'',
                    HOrderProcNO:'',
                    
@@ -509,6 +509,18 @@
                        this.getHBarCodeData(ret.resp_result)
                    }
                })
            },
            toInCode(e){
                var str = this.hform.HBarCode
                if(str.includes('@')) {
                  const parts = str.split('@');
                  this.hform.HBarCode = parts[0]
                  this.hform.HProcNo = parts[1]
                  this.getHBarCodeData(parts[0],1)
                  // this.getHProcNoData(parts[0],parts[1])
                }else{
                    this.getHBarCodeData(this.hform.HBarCode)
                }
            },
            //扫流水号
            toScanProcNo(){
@@ -837,7 +849,7 @@
                            this.hform.HMaterModel= data.规格型号
                            this.hform.单位= data.单位
                            // this.HQty= 0,
                            this.hform.HPieceQty= data.生产数量
                            // this.hform.HPieceQty= data.生产数量
                            this.hform.HPlanQty= data.生产数量
                            this.hform.lngBillSubKey= data.hsubid
                            this.hform.lngBillKey= data.hmainid
@@ -848,15 +860,15 @@
                            // this.hform.HMoney= 0
                            // this.hform.HSupID= data.HSupID
                            // this.hform.HSupName= data.供应商
                            this.hform.HSourceID= data.HSourceID
                            this.hform.HSource= data.生产资源
                            this.hform.HGroupID= data.HGroupID
                            this.hform.HGroupName= data.班组
                            // this.hform.HSourceID= data.HSourceID
                            // this.hform.HSource= data.生产资源
                            // this.hform.HGroupID= data.HGroupID
                            // this.hform.HGroupName= data.班组
                            this.hform.HDeptID= this.userInfo.HDeptID
                            this.hform.HDept= this.userInfo.HDept
                            this.hform.HProcExchHinteID= data.hmainid
                            this.hform.HPRDOrg= data.组织
							
                            this.hform.HPRDOrg= data.组织名称
                            this.hform.HPRDOrgID = data.HPRDORGID
                            if(e){
                                this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
                            }