From 1c35d7af1959e52c1adecf5e75900844a3835b9c Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 17 七月 2025 16:46:15 +0800
Subject: [PATCH] 添加扫码以后的提示音,添加生产领料校验,生产入库校验,生产调拨校验模块

---
 pages/shengchanruku/table.vue     |   91 +-
 pages/shouliaotongzhi/table.vue   |   12 
 pages/shengchandiaobo/table.vue   |   88 +-
 pages/xiaoshouchuku/form.vue      |   16 
 pages/caigoutuiliao/form.vue      |   16 
 README.md                         |    4 
 pages/shengchanlingliao/form.vue  |   31 
 pages/xiaoshoutuihuo/form.vue     |   16 
 pages/shengchanruku/form.vue      |  374 +-----------
 manifest.json                     |    4 
 pages/shengchandiaobo/form.vue    |  987 ++++------------------------------
 pages/shengchanlingliao/table.vue |   17 
 pages/caigouruku/form.vue         |   16 
 13 files changed, 372 insertions(+), 1,300 deletions(-)

diff --git a/README.md b/README.md
index fc97442..5ad36ef 100644
--- a/README.md
+++ b/README.md
@@ -22,4 +22,8 @@
 娣诲姞鍔熻兘妯″潡锛氳嚜鍔ㄦ洿鏂帮紝鎵撳嵃鏉$爜
 娴嬭瘯鏁版嵁锛氭敹鏂欓�氱煡鍗�(CGSL000145)
 
+2025/07/14
+娣诲姞鍔熻兘妯″潡:
+娴嬭瘯鏁版嵁锛氱敓浜ч鏂欙紙MATO00048891锛�,
+
 	
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 630d0a1..059f94f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "1.0.13",
-    "versionCode" : 113,
+    "versionName" : "1.0.15",
+    "versionCode" : 115,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index 60e6b87..dad5817 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -313,6 +313,15 @@
 			this.getHDeptList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
@@ -723,6 +732,7 @@
 				console.log(this.hform.HSourceBillNo,HSourceFlag)
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
+						this.playSound(0)
                         uni.showToast({
                         	title:'璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
@@ -735,9 +745,11 @@
 						        console.log('鍒犻櫎鏉$爜',res.data);
 								this.hform.HBarCode = ''
 								if(res.data.count == 1){
+									this.playSound(1)
 									this.hform.HQty = ''
 									this.DisBillEntryList()
 								}else{
+									this.playSound(0)
 									uni.showToast({
 										title:res.data.Message,
 										icon:'none'
@@ -746,6 +758,7 @@
 							},
 							fail: (res) => {
 								console.log(res);
+								this.playSound(0)
 								uni.showToast({
 									title:'鎺ュ彛璇锋眰澶辫触',
 									icon:'none'
@@ -765,6 +778,7 @@
 					        console.log('鎵爜杩斿洖',res.data);
 							this.hform.HBarCode = ''
 							if(res.data.count == 1){
+								this.playSound(1)
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉$爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -851,6 +865,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							}else{
+								this.playSound(0)
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -858,6 +873,7 @@
 							}
 						},
 						fail: (res) => {
+							this.playSound(0)
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/caigoutuiliao/form.vue b/pages/caigoutuiliao/form.vue
index ed5cd80..7e466a9 100644
--- a/pages/caigoutuiliao/form.vue
+++ b/pages/caigoutuiliao/form.vue
@@ -313,6 +313,15 @@
 			this.getHDeptList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
@@ -723,6 +732,7 @@
 				console.log(this.hform.HSourceBillNo,HSourceFlag)
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
+						this.playSound(0)
                         uni.showToast({
                         	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
@@ -735,9 +745,11 @@
 						        console.log('鍒犻櫎鏉$爜',res.data);
 								this.hform.HBarCode = ''
 								if(res.data.count == 1){
+									this.playSound(1)
 									this.hform.HQty = ''
 									this.DisBillEntryList()
 								}else{
+									this.playSound(0)
 									uni.showToast({
 										title:res.data.Message,
 										icon:'none'
@@ -745,6 +757,7 @@
 								}
 							},
 							fail: (res) => {
+								this.playSound(0)
 								console.log(res);
 								uni.showToast({
 									title:'鎺ュ彛璇锋眰澶辫触',
@@ -765,6 +778,7 @@
 					        console.log('鎵爜杩斿洖',res.data);
 							this.hform.HBarCode = ''
 							if(res.data.count == 1){
+								this.playSound(1)
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉$爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -828,6 +842,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							}else{
+								this.playSound(0)
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -835,6 +850,7 @@
 							}
 						},
 						fail: (res) => {
+							this.playSound(0)
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shengchandiaobo/form.vue b/pages/shengchandiaobo/form.vue
index 32f4181..3baee02 100644
--- a/pages/shengchandiaobo/form.vue
+++ b/pages/shengchandiaobo/form.vue
@@ -1,83 +1,21 @@
 <template>
 	<view>
 		<view class="form">
-			<view class="form-item">
-				<view class="title">鏉$爜:</view>
-				<view class="right" style="width: 380rpx;">
-					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"/>
-				</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>
-			<view class="form-item">
-				<view class="title">鏁伴噺:</view>
-				<view class="right">
-					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撳簱:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName" @input="HWHNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撲綅:</view>
-				<view class="right" v-show="showHStockPlaceName">
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-				</view>
-				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view>
-			</view>
-			
 			<view class="tabs">
-				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
 				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
 				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
 				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
-				<view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
 			</view>
 			
-			<view v-if="tabs == 0">
-				<view class="form-item">
-					<view class="title">婧愬崟绫诲瀷:</view>
-					<view class="right" v-show="showHMainSourceBillType">
-						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType" @change="HMainSourceBillTypeChange">
-							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-						</picker>
+			<view v-if="tabs == 1">
+				<view class="form-item" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
 					</view>
-					<view class="righton" v-show="!showHMainSourceBillType">
-						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType" 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>
 				</view>
-				<view class="form-item">
-					<view class="title">婧愬崟鍗曞彿:</view>
-					<view class="right" v-show="showHSourceBillNo">
-						<uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ュ師鍗曞崟鍙�" v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox>
-					</view>
-					<view class="righton" v-show="!showHSourceBillNo">
-						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ュ師鍗曞崟鍙�" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
-					</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="form-item">
-					<view class="title">鍒跺崟浜�:</view>
-					<view class="righton">
-						<input name="HMaker" disabled v-model="hform.HMaker" />
-					</view>
-				</view>
-				<view class="form-item">
+				<view class="form-item" v-show="!showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="righton">
 						<input name="HBillNo" disabled v-model="hform.HBillNo" />
@@ -89,101 +27,75 @@
 						<input name="HInterID" disabled v-model="hform.HInterID" />
 					</view>
 				</view>
-			</view>
-			
-			<view v-if="tabs == 1">
 				<view class="form-item">
-					<view class="title">淇濈:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName" @input="HKeeperNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">楠屾敹:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName" @input="HSecManagerNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">閮ㄩ棬:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName" @input="HDeptNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹㈡埛:</view>
-					<view class="right" v-show="showHSupName">
-						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName" @input="HSupNameChange"></uni-combox>
-					</view>
-					<view class="righton" v-show="!showHSupName">
-						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">缁勭粐:</view>
+					<view class="title">鍒跺崟浜�:</view>
 					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+						<input name="HMaker" disabled v-model="hform.HMaker" />
 					</view>
 				</view>
+				<view class="form-item">
+					<view class="title">璋冨嚭缁勭粐:</view>
+					<view class="righton">
+						<input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璋冨叆缁勭粐:</view>
+					<view class="righton">
+						<input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
+					</view>
+				</view>
+				<label class="checkbox">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
-			
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
 						<view class="card-detail">
 							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+								<text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
 							</view>
 							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+								<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
 							</view>
 							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
 								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
 							</view>
+							<view class="detail">
+								<text>鎵瑰彿锛�</text>{{item.鎵瑰彿}}
+							</view>
 							<view class="detail" v-if="item.杈呭姪灞炴��">
 								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+							<view class="detail">
+								<text>璋冨嚭浠撳簱锛�</text>{{item.璋冨嚭浠撳簱}}
+							</view>
+							<view class="detail">
+								<text>璋冨嚭浠撲綅锛�</text>{{item.璋冨嚭浠撲綅}}
+							</view>
+							<view class="detail">
+								<text>璋冨叆浠撳簱锛�</text>{{item.璋冨叆浠撳簱}}
+							</view>
+							<view class="detail">
+								<text>璋冨叆浠撲綅锛�</text>{{item.璋冨叆浠撲綅}}
+							</view>
+							<view class="detail">
+								<text>鐢熶骇鏃ユ湡锛�</text>{{item.鐢熶骇鏃ユ湡}}
+							</view>
+							<view class="detail">
+								<text>鏈夋晥鏈熻嚦锛�</text>{{item.鏈夋晥鏈熻嚦}}
+							</view>
+							<view class="detail">
+								<text>鍗曟嵁鍙凤細</text>{{item.鍗曟嵁鍙穧}
+							</view>
+							<view class="detail">
+								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
 							</view>
 						</view>
 					</uni-card>
 				</view>
 				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
-			
-			<view v-if="tabs == 4">
-				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
-					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;" @tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.HQty}}
-							</view>
-							<view class="detail">
-								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
-							</view>
-							<view class="detail">
-								<text>浠撳簱锛�</text>{{item.HWhName}}
-							</view>
-							<view class="detail">
-								<text>浠撲綅锛�</text>{{item.HSPName}}
-							</view>
-							<view class="detail">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
-							</view>
-							<view class="detail" v-if="item.HBatchNo">
-								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
-							</view>
-							<view class="detail" v-if="item.HAuxPropName">
-								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
 			</view>
 			
 			<view v-if="tabs == 3">
@@ -230,15 +142,27 @@
 					</view>
 				</view>
 				<view class="form-item">
-					<view class="title">浠撳簱:</view>
+					<view class="title">璋冨叆浠撳簱:</view>
 					<view class="righton">
 						<input disabled v-model="hform.HWHName_B" />
 					</view>
 				</view>
 				<view class="form-item">
-					<view class="title">浠撲綅:</view>
+					<view class="title">璋冨叆浠撲綅:</view>
 					<view class="righton">
 						<input disabled v-model="hform.HSPName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璋冨嚭浠撳簱:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSCWHName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璋冨嚭浠撲綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSCSPName_B" />
 					</view>
 				</view>
 			</view>
@@ -258,44 +182,18 @@
             return {
 				userInfo:getUserInfo(),
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				HModName:'Kf_SellOutBill_PDA',
-				ModRightName:'CE_SellOut',
+				HModName:'Kf_MoveStockBill_Check_PDA',
+				ModRightName:'CE_MoveStockCheck',
 				OperationType: 1,
-				HInterID_Temp:'',
 				
-				showHStockPlaceName:true,
-				showHMainSourceBillType:true,
-				showHSourceBillNo:true,
-				reHSourceBillNo:true,
-				showHSupName:true,
-				
-				tabs:0,
-				HMainSourceBillType:'鍙戣揣閫氱煡鍗�',
-				arrayHMainSourceBillType:['鍙戣揣閫氱煡鍗�','閿�鍞鍗�','鎵嬪伐褰曞叆'],
-				
+				showHBillNo:true,
+				tabs:1,
 				linterid:'',
 				HBillNo:'',
-				btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
-				
-				arrayHWHName:[],//浠撳簱
-				HWHNameList:[],
-				arrayHStockPlaceName:[],//浠撲綅
-				HStockPlaceNameList:[],
-				arrayHSourceBillNo:[],//鍘熷崟鍗曞彿
-				HSourceBillNoList:[],
-				
-				arrayHEmpName:[],//鎿嶄綔鍛�
-				HEmpNameList:[],
-				arrayHDeptName:[],//閮ㄩ棬
-				HDeptNameList:[],
-				arrayHSupName:[],//瀹㈡埛
-				HSupNameList:[],
-				
+
 				Materlist:[],
-				FIFOlist:[],
 				hform:{
-					HBillType:1205,
+					HBillType:1207,
 					HBillerID:uni.getStorageSync('HBillerID'),
 					HRedBlueFlag:false,
 					
@@ -306,25 +204,17 @@
 					HStockPlaceName:getUserInfo().HSPName,
 					HStockPlaceID:getUserInfo().HSPID,
 					
-					HMainSourceBillType:1402,
-					HSourceBillNo:'',//CGDD000200
-					HFIFOWHName:'',
-					HFIFOWHID:'',
-					HDate:getDateTime.dateTimeStr('y-m-d'),
-					HMaker:uni.getStorageSync('HUserName'),
 					HBillNo:'',
 					HInterID:'',
-					
-					HKeeperName:getUserInfo().HKeeper,
-					HKeeperID:getUserInfo().HKeeperID,
-					HSecManagerName:getUserInfo().HSecManager,
-					HSecManagerID:getUserInfo().HSecManagerID,
-					HDeptName:getUserInfo().HDept,
-					HDeptID:getUserInfo().HDeptID,
-					HSupName:'',
-					HSupID:'',
-					HStockOrgName:uni.getStorageSync('Organization'),
+					HMaker:uni.getStorageSync('HUserName'),
 					HStockOrgID:uni.getStorageSync('OrganizationID'),
+					HStockOutOrgName:uni.getStorageSync('Organization'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HStockInOrgName:uni.getStorageSync('Organization'),
+					HStockInOrgID:uni.getStorageSync('OrganizationID'),
+					HSourceBarCodeCtl:"N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+					chkHBarflag:false,
+					HBarflag:'',
 
 					HBarCode_B:'',
 					HMaterName_B:'',
@@ -335,411 +225,76 @@
 					HTMQty_B:'',
 					HWHName_B:'',
 					HSPName_B:'',
+					HSCWHName_B:'',
+					HSCSPName_B:'',
 				}
             }
         },
 		onLoad(e) {
 			console.log(e,this.userInfo)
 			this.OperationType = e.OperationType
-			if(e.HInterID){
-				this.HInterID_Temp = e.HInterID
-				// this.btnType = 1
-				this.RoadBillMain(e.HInterID)
-			}else{
-				this.getNewData()
+			if(e.HBillNo){
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo(e.HBillNo)
 			}
-			this.getHBaseList()
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
 				    onlyFromCamera: true,
 				    success: (res) => {
 				        console.log('鏉$爜鍐呭锛�' + res.result);
-						if(this.hform.HBarCode == '*'){
-							this.hform.HBarCode = this.hform.HBarCode + res.result
-						}else{
-							this.hform.HBarCode = res.result
-						}
-						
-						this.getCode(this.hform.HBarCode)
+						this.hform.HBillNo = res.result
+						this.GetMeesageByBillNo(this.hform.HBillNo)
 				    }
 				});
 			},
-			//鎵叾浠�(浠撳簱锛屼粨浣�)
-			// toScanData(e){
-			// 	uni.scanCode({
-			// 	    onlyFromCamera: true,
-			// 	    success: (res) => {
-			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
-			// 			var code = res.result
-			// 			if(e == 1){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
-			// 					success: (res) => {
-			// 						this.hform.HStockPlaceID = 0
-			// 						this.hform.HStockPlaceName = ''
-			// 						this.showHStockPlaceName = true
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HItemID
-			// 							this.hform.HWHName = data.HName
-			// 							if (data.HSPFlag == 0) {
-			// 							    this.showHStockPlaceName = false
-			// 							}
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}else if(e == 2){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
-			// 					success: (res) => {
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HWHID
-			// 							this.hform.HWHName = data.HWhName
-			// 							this.hform.HStockPlaceID = data.HItemID
-			// 							this.hform.HStockPlaceName = data.HName
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							this.hform.HStockPlaceID = 0
-			// 							this.hform.HStockPlaceName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}
-			// 	    }
-			// 	});
-			// },
-			//鏃ユ湡
-			HDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HDate = e.detail.value
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList(){
+			//鎵弿鍗曟嵁鍙锋潯鐮�
+			GetMeesageByBillNo(e){
 				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json', 
+					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:this.hform.HStockOrgID},
 					success: (res) => {
 						if(res.data.count == 1){
-							this.HWHNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-							}
-						}else{
-							uni.showToast({
-								title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				
-				uni.request({
-					url: this.serverUrl + '/Gy_StockPlace/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HStockPlaceNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
-							}
-						}else{
-							uni.showToast({
-								title:'浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				
-				this.getHYDList()
-			},
-			//婧愬崟璧勬枡
-			getHYDList(){
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json', 
-					data: {HBillType:this.hform.HBillType,HSourceBillType:this.hform.HMainSourceBillType,HStockOrgID:this.hform.HStockOrgID,HSourceBillNo:"",HMater:"",HCustom:""},
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HSourceBillNoList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.reHSourceBillNo = false
-							this.$nextTick(()=>{
-								this.reHSourceBillNo = true
-							})
-						}else{
-							uni.showToast({
-								title:'婧愬崟鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浠撳簱
-			HWHNameChange(e){
-				// var name = e.split("(")
-				for(var i=0;i<this.HWHNameList.length;i++){
-					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
-						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
-			HFIFOWHNameChange(e){
-				for(var i=0;i<this.HWHNameList.length;i++){
-					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
-						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			HStockPlaceNameChange(e){
-				for(var i=0;i<this.HStockPlaceNameList.length;i++){
-					if(this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e){
-						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨婧愬崟
-			HSourceBillNoChange(e){
-				this.hform.HSourceBillNo = e						
-				this.getHBarCodeData(e)
-				// for(var i=0;i<this.HSourceBillNoList.length;i++){
-				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
-				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
-				// 	}
-				// }
-			},
-			//閫夋嫨婧愬崟绫诲瀷
-			HMainSourceBillTypeChange(e){
-				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-				if(this.HMainSourceBillType == '鍙戣揣閫氱煡鍗�'){
-					this.hform.HMainSourceBillType = 1402
-					this.getHYDList()
-				}else if(this.HMainSourceBillType == '閿�鍞鍗�'){
-					this.hform.HMainSourceBillType = 1401
-					this.getHYDList()
-				}else{
-					this.hform.HMainSourceBillType = -1
-					this.getHYDList()
-				}
-			},
-			
-			//鑾峰彇瀹㈡埛鏁版嵁
-			getHSupList(){
-				uni.request({
-				    url: this.serverUrl + '/Gy_Customer/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
-				    success: (res) => {
-						if(res.data.count == 1){
-							this.HSupNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHSupName[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'
-						})
-					},
-				});
-			},
-			//閫夋嫨瀹㈡埛
-			HSupNameChange(e){
-				for(var i=0;i<this.HSupNameList.length;i++){
-					if(this.HSupNameList[i].瀹㈡埛鍚嶇О == e){
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			getHDeptList(){
-				uni.request({
-				    url: this.serverUrl + '/Gy_Department/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
-				    success: (res) => {
-						if(res.data.count == 1){
-							this.HDeptNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浣跨敤閮ㄩ棬
-			HDeptNameChange(e){
-				for(var i=0;i<this.HDeptNameList.length;i++){
-					if(this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e){
-						this.hform.HDeptID = this.HDeptNameList[i].HItemID
-						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-					}
-				}
-			},
-			//鎿嶄綔鍛�
-			getHEmpList(){
-				uni.request({
-					url: this.serverUrl + '/Web/GetEmployeeList_Json', 
-					data: { Employee: '',HGroupID:0 },
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HEmpNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHEmpName[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'浜哄憳鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//淇濈
-			HKeeperNameChange(e){
-				for(var i=0;i<this.HEmpNameList.length;i++){
-					if(this.HEmpNameList[i].HName == e){
-						console.log(this.HEmpNameList[i])
-						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-						this.hform.HKeeperName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//楠屾敹
-			HSecManagerNameChange(e){
-				for(var i=0;i<this.HEmpNameList.length;i++){
-					if(this.HEmpNameList[i].HName == e){
-						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-						this.hform.HSecManagerName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//閫変腑婧愬崟
-			getHBarCodeData(HBarCode){
-				if(!this.hform.HFIFOWHName){
-					this.hform.HFIFOWHID = 0
-				}
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/get_SourceBarCode_SellOut_Json', 
-					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HSourceBillNo: HBarCode, HSourceBillType: this.hform.HMainSourceBillType, HMaker: this.hform.HMaker, HOWNERID: this.hform.HStockOrgID,HFIFOWhID:this.hform.HFIFOWHID, },
-				    success: (res) => {
-						if(res.data.count == 1){
+							this.playSound(1)
 							var data = res.data.data
-							console.log(2,data);
-							this.hform.HSupName = data.hSupNameField
-							this.hform.HSupID = data.hSupIDField
-							if (data.hDeptIDField != 0) {
-								this.hform.HDeptID = data.hDeptIDField
-								this.hform.HDeptName = data.hDeptNameField
-							}
-							this.hform.HSourceBillNo = data.hSourceBillNoField
-							this.showHMainSourceBillType = false
-							if(data.hMulSourceFlagField == 0){
-								this.showHSourceBillNo = false
+							console.log(data)
+							this.hform.HInterID = data.hInterIDField
+							this.hform.HBillNo = data.hBillNoField
+							this.hform.HStockOutOrgID = data.hStockOutOrgIDField
+							this.hform.HStockOutOrgName = data.hStockOutOrgNameField
+							this.hform.HStockInOrgID = data.hStockInOrgIDField
+							this.hform.HStockInOrgName = data.hStockInOrgNameField
+							this.showHBillNo = false
+							//鏉$爜鏍稿鏍囪
+							if (data.hSourceBarCodeFlagField) {
+								this.hform.HSourceBarCodeCtl = "Y"
+								this.hform.chkHBarflag = true
+								this.hform.HBarflag = data
 							}
 							this.tabs = 2
-							this.showHSupName = false
-							this.DisBillEntryList()
+							this.DisBillEntryList();
 						}else{
+							this.playSound(0)
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
 							})
+							this.hform.HBillNo = ''
 						}
 					},
 					fail: (res) => {
+						this.playSound(0)
 						console.log(res);
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
@@ -747,165 +302,17 @@
 						})
 					},
 				});
-			},
-			//鎵潯鐮佸鐞�
-			getCode(HBarCode){
-				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				var sOldBarCode = HBarCode
-				var HDeleteFlag = sOldBarCode.substring(0, 1);
-				var sBarCode = sOldBarCode.slice(1);
-
-				var sHWHID = this.hform.HWHID
-				var sHSPID = this.hform.HStockPlaceID
-				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)
-                if (HDeleteFlag == "*") {
-                    if (sBarCode == "") {
-                        uni.showToast({
-                        	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-							icon:'none'
-                        })
-                    }else{
-						uni.request({
-						    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json', 
-							data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBarCode: sBarCode },
-						    success: (res) => {
-						        console.log('鍒犻櫎鏉$爜',res.data);
-								this.hform.HBarCode = ''
-								if(res.data.count == 1){
-									this.hform.HQty = ''
-									this.DisBillEntryList()
-								}else{
-									uni.showToast({
-										title:res.data.Message,
-										icon:'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title:'鎺ュ彛璇锋眰澶辫触',
-									icon:'none'
-								})
-							},
-						});
-					}
-                }else {
-                    var sBarCode = this.hform.HBarCode
-                    if (sHQty == "") {
-                        sHQty = 0;
-                    }
-					uni.request({
-					    url: this.serverUrl + '/WEBSController/Get_BarCode_Json', 
-						data: { sBarCode: sBarCode, HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBillNo: this.hform.HBillNo, HMaker: this.hform.HMaker, HWhID: sHWHID, HSPID: sHSPID, HQty: sHQty, HRedBlueFlag: this.hform.HRedBlueFlag, SourceFlag: HSourceFlag, HSourceBillNo: sSourceBillNo, HSourceBillType: sSourceBillType, HStockOrgID: this.hform.HStockOrgID, HScanStyle: "", HCustom1: "", HCustom2: "" },
-					    success: (res) => {
-					        console.log('鎵爜杩斿洖',res.data);
-							this.hform.HBarCode = ''
-							if(res.data.count == 1){
-								var data = res.data.data
-								if (data.hBarTypeField == '浠撳簱鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = ''
-									this.hform.HStockPlaceID = 0
-								    if (data.hSPFlagField == 0) {
-										this.showHStockPlaceName = false
-								    }else {
-										this.showHStockPlaceName = true
-								    }
-								}else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = data.hSPNameField
-									this.hform.HStockPlaceID = data.hSPIDField
-								}else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-									this.hform.HDeptName = data.hDeptNameField
-									this.hform.HDeptID = data.hDeptIDField
-								    this.tabs = 1
-								}else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-								    this.hform.HSupName = data.hSupNameField
-									this.hform.HSupID = data.hSupIDField
-								    if (data.hDeptIDField != 0) {
-										this.hform.HDeptID = data.hDeptIDField
-										this.hform.HDeptName = data.hDeptNameField
-								    }
-									this.hform.HSourceBillNo = data.hSourceBillNoField
-								    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-									this.hform.HMainSourceBillType = data.hSourceBillTypeField
-								    if (data.hSourceBillTypeField == "1402") {
-										this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
-										this.hform.HMainSourceBillType = 1402
-										this.showHMainSourceBillType = false
-								    }else if (data.hSourceBillTypeField == "1401") {
-										this.HMainSourceBillType = '閿�鍞鍗�'
-										this.hform.HMainSourceBillType = 1401
-										this.showHMainSourceBillType = false
-								    }else {
-								        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										this.hform.HMainSourceBillType = -1
-								        this.showHMainSourceBillType = false
-								    }
-								    if (data.hMulSourceFlagField == 0) {
-										this.showHSourceBillNo = false
-								    }
-								    //瀹㈡埛涓嶅彲缂栬緫
-									this.showHSupName = false
-									this.tabs = 2
-								}else {//鐗╂枡鏉$爜
-									this.tabs = 2
-									if(!this.hform.HSourceBillNo){
-										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										this.hform.HMainSourceBillType = -1
-										this.showHMainSourceBillType = false
-										this.showHSourceBillNo = false
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-							}else{
-								uni.showToast({
-									title:res.data.Message,
-									icon:'none'
-								})
-							}
-						},
-						fail: (res) => {
-							console.log(res);
-							uni.showToast({
-								title:'鎺ュ彛璇锋眰澶辫触',
-								icon:'none'
-							})
-						},
-					});
-                }				
 			},
 			//鐗╂枡淇℃伅
 			DisBillEntryList(){
 				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json', 
-					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HStockOrgID: this.hform.HStockOrgID },
+				    url: this.serverUrl + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json', 
+					data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl, sWhere: '' },
 				    success: (res) => {
 						console.log('鐗╂枡',res.data)
 						if(res.data.count == 1){
 							var data = res.data.data
 							this.Materlist = data.Materlist
-							if (data.FIFOlist.length != 0) {
-							    if (data.FIFOlist[0].HMaterID != 0) {
-							       this.FIFOlist = data.FIFOlist
-							    }
-							}
 							if(!data.BarCodeDetailslist[0].HBarCode){
 								this.hform.HMaterName_B = ''
 								this.hform.HMaterModel_B = ''
@@ -915,6 +322,8 @@
 								this.hform.HTMQty_B = ''
 								this.hform.HWHName_B = ''
 								this.hform.HSPName_B = ''
+								this.hform.HSCWHName_B = ''
+								this.hform.HSCSPName_B = ''
 							}else{
 								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
 								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
@@ -924,121 +333,12 @@
 								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
 								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
 								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+								this.hform.HSCWHName_B = data.BarCodeDetailslist[0].HSCWHName
+								this.hform.HSCSPName_B = data.BarCodeDetailslist[0].HSCSPName
 							}
 						}else{
 							uni.showToast({
 								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//鍒犻櫎鐗╂枡鐮�
-			delMater(item){
-				uni.showModal({
-				    title: '鎻愮ず',
-				    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-				    success: (res) => {
-				        if (res.confirm) {
-				            uni.request({
-				                url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json', 
-				            	data: { HInterID: this.hform.HInterID, HMaterID: item.HMaterID, HAuxPropID: item.HAuxPropID, HMTONo: item.HMTONo, HSourceInterID: item.HSourceInterID, HSourceEntryID: item.HSourceEntryID, HBillType: this.hform.HBillType },
-				                success: (res) => {
-				            		if(res.data.count == 1){
-				            			this.DisBillEntryList()
-				            		}else{
-				            			uni.showToast({
-				            				title:res.data.Message,
-				            				icon:'none'
-				            			})
-				            		}
-				            	},
-				            	fail: (res) => {
-				            		console.log(res);
-				            		uni.showToast({
-				            			title:'鎺ュ彛璇锋眰澶辫触',
-				            			icon:'none'
-				            		})
-				            	},
-				            });
-				        }
-				    }
-				});
-			},
-			//鏂板
-			getNewData(){
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json', 
-					data: { HBillType: this.hform.HBillType },
-				    success: (res) => {
-						// console.log(res.data)
-						if(res.data.count == 1){
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//淇敼鍥炲~鏁版嵁
-			RoadBillMain(HInterID){
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json', 
-					data: {HInterID: HInterID,HBillType:this.hform.HBillType},
-				    success: (res) => {
-				        console.log(33,res.data.data[0]);
-						if(res.data.count == 1){
-							var data = res.data.data[0]
-							this.hform.HInterID = data.HInterID
-							this.hform.HBillNo = data.HBillNo
-							this.hform.HMainSourceBillType = data.HSourceBillType
-							this.hform.HSourceBillNo = data.HSourceBillNo
-							if(data.HSourceBillType == 1402){
-								this.hform.HMainSourceBillType = 1402
-								this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
-								this.showHSupName = false
-							}else if(data.HSourceBillType == 1401){
-								this.hform.HMainSourceBillType = 1401
-								this.HMainSourceBillType = '閿�鍞鍗�'
-								this.showHSupName = false
-							}else{
-								this.hform.HMainSourceBillType = -1
-								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-							}
-							this.showHMainSourceBillType = false
-							
-							//闈炲婧愬崟妯″紡
-							if (data.HMulSourceBill == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.hform.HDeptID = data.HDeptID
-							this.hform.HDeptName = data.HDeptName
-							this.hform.HSupID = data.HCusID
-							this.hform.HSupName = data.HCusName
-							this.DisBillEntryList()
-							this.tabs = 2
-						}else{
-							uni.showToast({
-								title:'鑾峰彇鏁版嵁鍥炲~澶辫触',
 								icon:'none'
 							})
 						}
@@ -1053,28 +353,9 @@
 				});
 			},
             submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if(!this.hform.HWHName){
-					this.hform.HWHID = 0
-				}
-				if(!this.hform.HStockPlaceName){
-					this.hform.HStockPlaceID = 0
-				}
-				if(!this.hform.HKeeperName){
-					this.hform.HKeeperID = 0
-				}
-				if(!this.hform.HSecManagerName){
-					this.hform.HSecManagerID = 0
-				}
-				if(!this.hform.HDeptName){
-					this.hform.HDeptID = 0
-				}
-				if(!this.hform.HSupName){
-					this.hform.HSupID = 0
-				}
             	if(this.hform.HInterID == 0 ||!this.hform.HInterID){
             		uni.showToast({
-            			title:'鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+            			title:'娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒',
             			icon:'none'
             		})
 				}else if(!this.hform.HBillNo){
@@ -1105,7 +386,7 @@
 						})
 						var sMainStr = JSON.stringify(this.hform);
 						uni.request({
-						    url: this.serverUrl + '/WEBSController/set_SaveSellOutBill_Json',
+						    url: this.serverUrl + '/WEBSController/set_SaveMoveStockBill_BillCheck_Json',
 							method:'POST',
 							dataType:"json",
 							data:{ oMain: sMainStr },
@@ -1120,13 +401,13 @@
 									        if (res.confirm) {
 									            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 												uni.redirectTo({
-													url:'/pages/xiaoshouchuku/form?OperationType=1'
+													url:'/pages/shengchandiaobo/form?OperationType=1'
 												})
 									        } else if (res.cancel) {
 									            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 												setTimeout(()=>{
 													uni.navigateBack();
-												},500)
+												},50)
 									        }
 									    }
 									});
@@ -1157,7 +438,7 @@
 				        if (res.confirm) {
 				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.redirectTo({
-								url:'/pages/xiaoshouchuku/table'
+								url:'/pages/caigouruku/table'
 							})
 				        } else if (res.cancel) {
 				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1306,4 +587,10 @@
 			}
 		}
 	}
+	.checkbox{
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shengchandiaobo/table.vue b/pages/shengchandiaobo/table.vue
index 16320a5..8e38749 100644
--- a/pages/shengchandiaobo/table.vue
+++ b/pages/shengchandiaobo/table.vue
@@ -19,12 +19,6 @@
 					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
 				</view>
 			</view>
-			<view class="form-item">
-				<view class="title">婧愬崟鍗曞彿:</view>
-				<view class="right">
-					<input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-				</view>
-			</view>
 			<view class="buttons">
 				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
 				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
@@ -41,12 +35,6 @@
 					</view>
 					<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
 						<text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
-					</view>
-					<view class="detail" v-if="item.鏁伴噺">
-						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-					</view>
-					<view class="detail" v-if="item.婧愬崟鍗曞彿">
-						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
 					</view>
 					<view class="detail" v-if="item.缁勭粐">
 						<text>缁勭粐锛�</text>{{item.缁勭粐}}
@@ -71,9 +59,6 @@
 					</view>
 					<view class="detail" v-if="item.鏁伴噺">
 						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-					</view>
-					<view class="detail" v-if="item.婧愬崟鍗曞彿">
-						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
 					</view>
 					<view class="detail" v-if="item.鐗╂枡浠g爜">
 						<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
@@ -111,12 +96,11 @@
 				userInfo:getUserInfo(),
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
 				tabs:0,
-				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
-				MvarReportTitle:'閿�鍞嚭搴撳崟缂撳瓨鍒楄〃',
+				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+				MvarReportTitle:'鐩存帴璋冩嫧鍗曟牎楠岀紦瀛樺垪琛�',
 				hform:{
 					HBillNo:'',
-					HSourceBillNo:'',
-					HBillType: 1205,
+					HBillType: 1207,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 				},
@@ -151,7 +135,7 @@
 				uni.request({
 				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
 					data:{ 
-						ModRightName: 'CE_SellOut',
+						ModRightName: 'CE_MoveStockCheck',
 						HUserName: uni.getStorageSync('HUserName')
 					},
 				    success: (res) => {
@@ -183,10 +167,10 @@
 				this.showList = []
 				
 				if(this.tabs == 0){
-					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json'
+					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json'
 				}
 				if(this.tabs == 1){
-					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json'
 				}
 				this.getList()
 			},
@@ -247,8 +231,7 @@
 				this.sWhere = ''
 				this.hform = {
 					HBillNo:'',
-					HSourceBillNo:'',
-					HBillType: 1205,
+					HBillType: 1207,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 				}
@@ -262,32 +245,33 @@
 			//缂栬緫
 			edit(item){
 				console.log(item)
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-					data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
-							uni.navigateTo({
-								url:'./form?OperationType=2&HInterID=' + item.HInterID
-							})
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-	
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
+				uni.navigateTo({
+					url:'./form?OperationType=2&HBillNo=' + item.HBillNo
 				})
+	// 			uni.request({
+	// 			    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+	// 				data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
+	// 			    success: (res) => {
+	// 			        console.log(1,res);
+	// 					if(res.data.count == 1){
+							
+	// 					}else{
+	// 						uni.showToast({
+	// 							title:res.data.Message,
+	// 							icon:'none'
+	// 						})
+	// 					}
+	
+	// 				},
+	// 				fail: (res) => {
+	// 					console.log(res);
+	// 					uni.hideLoading()
+	// 					uni.showToast({
+	// 						title:'鎺ュ彛璇锋眰澶辫触',
+	// 						icon:'none'
+	// 					})
+	// 				},
+	// 			})
 			},
 			//鍒犻櫎
 			del(item){
@@ -299,12 +283,13 @@
 				        if (res.confirm) {
 				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.request({
-							    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_New_Json',
+							    url: this.serverUrl + '/WEBSController/DeleteTempBillList_BillCheck_Json',
 								data:{ 
 									HInterID: item.HInterID,
 									HBillNo: item.鍗曟嵁鍙�,
 									HBillType: this.hform.HBillType,
 									HMaker: uni.getStorageSync('HUserName'),
+									HStockOrgID:this.hform.HStockOrgID,
 									MvarReportTitle:this.MvarReportTitle,
 								},
 							    success: (res) => {
@@ -342,12 +327,13 @@
 				        if (res.confirm) {
 				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.request({
-							    url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+							    url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_BillCheck_Json',
 								data:{ 
 									HInterID: item.HInterID,
 									HBillNo: item.鍗曟嵁鍙�,
 									HBillType: this.hform.HBillType,
 									HMaker: uni.getStorageSync('HUserName'),
+									HStockOrgID:this.hform.HStockOrgID,
 									MvarReportTitle:this.MvarReportTitle,
 								},
 							    success: (res) => {
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index c7185e4..8005038 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -39,7 +39,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo()"/>
 					</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>
@@ -67,6 +67,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -195,8 +198,8 @@
 					HStockOrgName:uni.getStorageSync('Organization'),
 					HStockOrgID:uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl:"N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag:1,
-					HBarflag:'Y',
+					chkHBarflag:false,
+					HBarflag:'',
 
 					HBarCode_B:'',
 					HMaterName_B:'',
@@ -222,6 +225,15 @@
 			// this.getHBaseList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
@@ -233,8 +245,8 @@
 						// }else{
 						// 	this.hform.HBarCode = res.result
 						// }
-						this.hform.HBarCode = res.result
-						this.GetMeesageByBillNo(this.hform.HBarCode)
+						this.hform.HBillNo = res.result
+						this.GetMeesageByBillNo(res.result)
 				    }
 				});
 			},
@@ -245,6 +257,7 @@
 					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:this.hform.HStockOrgID},
 					success: (res) => {
 						if(res.data.count == 1){
+							this.playSound(1)
 							var data = res.data.data
 							console.log(data)
 							this.hform.HInterID = data.hInterIDField
@@ -259,6 +272,7 @@
 							this.tabs = 2
 							this.DisBillEntryList();
 						}else{
+							this.playSound(0)
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -268,6 +282,7 @@
 					},
 					fail: (res) => {
 						console.log(res);
+						this.playSound(0)
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
 							icon:'none'
@@ -824,4 +839,10 @@
 			}
 		}
 	}
+	.checkbox{
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shengchanlingliao/table.vue b/pages/shengchanlingliao/table.vue
index 1126f17..3911350 100644
--- a/pages/shengchanlingliao/table.vue
+++ b/pages/shengchanlingliao/table.vue
@@ -19,12 +19,6 @@
 					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
 				</view>
 			</view>
-			<view class="form-item">
-				<view class="title">婧愬崟鍗曞彿:</view>
-				<view class="right">
-					<input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-				</view>
-			</view>
 			<view class="buttons">
 				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
 				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
@@ -41,12 +35,6 @@
 					</view>
 					<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
 						<text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
-					</view>
-					<view class="detail" v-if="item.鏁伴噺">
-						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-					</view>
-					<view class="detail" v-if="item.婧愬崟鍗曞彿">
-						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
 					</view>
 					<view class="detail" v-if="item.缁勭粐">
 						<text>缁勭粐锛�</text>{{item.缁勭粐}}
@@ -71,9 +59,6 @@
 					</view>
 					<view class="detail" v-if="item.鏁伴噺">
 						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-					</view>
-					<view class="detail" v-if="item.婧愬崟鍗曞彿">
-						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
 					</view>
 					<view class="detail" v-if="item.鐗╂枡浠g爜">
 						<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
@@ -115,7 +100,6 @@
 				MvarReportTitle:'鐢熶骇棰嗘枡鍗曟牎楠岀紦瀛樺垪琛�',
 				hform:{
 					HBillNo:'',
-					HSourceBillNo:'',
 					HBillType: 1204,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
@@ -247,7 +231,6 @@
 				this.sWhere = ''
 				this.hform = {
 					HBillNo:'',
-					HSourceBillNo:'',
 					HBillType: 1204,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
diff --git a/pages/shengchanruku/form.vue b/pages/shengchanruku/form.vue
index c7185e4..d96b883 100644
--- a/pages/shengchanruku/form.vue
+++ b/pages/shengchanruku/form.vue
@@ -1,35 +1,7 @@
 <template>
 	<view>
 		<view class="form">
-<!-- 			<view class="form-item">
-				<view class="title">鏉$爜:</view>
-				<view class="right" style="width: 380rpx;">
-					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"/>
-				</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> -->
-<!-- 			<view class="form-item">
-				<view class="title">鏁伴噺:</view>
-				<view class="right">
-					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撳簱:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName" @input="HWHNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撲綅:</view>
-				<view class="right" v-show="showHStockPlaceName">
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-				</view>
-				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view>
-			</view> -->
-			
 			<view class="tabs">
-				<!-- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view> -->
 				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
 				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
 				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
@@ -67,11 +39,17 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
 					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
 						<view class="card-detail">
+							<view class="detail">
+								<text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+							</view>
 							<view class="detail">
 								<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
 							</view>
@@ -79,10 +57,28 @@
 								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
 							</view>
 							<view class="detail">
-								<text>鎵规锛�</text>{{item.鎵规}}
+								<text>鎵瑰彿锛�</text>{{item.鎵瑰彿}}
 							</view>
 							<view class="detail" v-if="item.杈呭姪灞炴��">
 								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+							<view class="detail">
+								<text>浠撳簱锛�</text>{{item.浠撳簱}}
+							</view>
+							<view class="detail">
+								<text>浠撲綅锛�</text>{{item.浠撲綅}}
+							</view>
+							<view class="detail">
+								<text>鐢熶骇鏃ユ湡锛�</text>{{item.鐢熶骇鏃ユ湡}}
+							</view>
+							<view class="detail">
+								<text>鏈夋晥鏈熻嚦锛�</text>{{item.鏈夋晥鏈熻嚦}}
+							</view>
+							<view class="detail">
+								<text>鍗曟嵁鍙凤細</text>{{item.鍗曟嵁鍙穧}
+							</view>
+							<view class="detail">
+								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
 							</view>
 						</view>
 					</uni-card>
@@ -162,23 +158,18 @@
             return {
 				userInfo:getUserInfo(),
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				HModName:'Kf_MateOutBill_Check_PDA',
-				ModRightName:'CE_MateOutCheck',
+				HModName:'Kf_ProductInBill_Check_PDA',
+				ModRightName:'CE_ProductInCheck',
 				OperationType: 1,
 				
 				showHBillNo:true,
 				tabs:1,
 				linterid:'',
 				HBillNo:'',
-				
-				arrayHWHName:[],//浠撳簱
-				HWHNameList:[],
-				arrayHStockPlaceName:[],//浠撲綅
-				HStockPlaceNameList:[],
-				
+
 				Materlist:[],
 				hform:{
-					HBillType:1204,
+					HBillType:1202,
 					HBillerID:uni.getStorageSync('HBillerID'),
 					HRedBlueFlag:false,
 					
@@ -195,8 +186,8 @@
 					HStockOrgName:uni.getStorageSync('Organization'),
 					HStockOrgID:uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl:"N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag:1,
-					HBarflag:'Y',
+					chkHBarflag:false,
+					HBarflag:'',
 
 					HBarCode_B:'',
 					HMaterName_B:'',
@@ -216,25 +207,26 @@
 			if(e.HBillNo){
 				this.hform.HBillNo = e.HBillNo
 				this.GetMeesageByBillNo(e.HBillNo)
-			}else{
-				// this.getNewData()
 			}
-			// this.getHBaseList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
 				    onlyFromCamera: true,
 				    success: (res) => {
 				        console.log('鏉$爜鍐呭锛�' + res.result);
-						// if(this.hform.HBarCode == '*'){
-						// 	this.hform.HBarCode = this.hform.HBarCode + res.result
-						// }else{
-						// 	this.hform.HBarCode = res.result
-						// }
-						this.hform.HBarCode = res.result
-						this.GetMeesageByBillNo(this.hform.HBarCode)
+						this.hform.HBillNo = res.result
+						this.GetMeesageByBillNo(this.hform.HBillNo)
 				    }
 				});
 			},
@@ -245,6 +237,7 @@
 					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:this.hform.HStockOrgID},
 					success: (res) => {
 						if(res.data.count == 1){
+							this.playSound(1)
 							var data = res.data.data
 							console.log(data)
 							this.hform.HInterID = data.hInterIDField
@@ -259,6 +252,7 @@
 							this.tabs = 2
 							this.DisBillEntryList();
 						}else{
+							this.playSound(0)
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -267,6 +261,7 @@
 						}
 					},
 					fail: (res) => {
+						this.playSound(0)
 						console.log(res);
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
@@ -274,243 +269,6 @@
 						})
 					},
 				});
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList(){
-				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HWHNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-							}
-						}else{
-							uni.showToast({
-								title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				
-				uni.request({
-					url: this.serverUrl + '/Gy_StockPlace/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HStockPlaceNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
-							}
-						}else{
-							uni.showToast({
-								title:'浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浠撳簱
-			HWHNameChange(e){
-				// var name = e.split("(")
-				for(var i=0;i<this.HWHNameList.length;i++){
-					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
-						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			HStockPlaceNameChange(e){
-				for(var i=0;i<this.HStockPlaceNameList.length;i++){
-					if(this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e){
-						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-					}
-				}
-			},
-			//鎵潯鐮佸鐞�
-			getCode(HBarCode){
-				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				var sOldBarCode = HBarCode
-				var HDeleteFlag = sOldBarCode.substring(0, 1);
-				var sBarCode = sOldBarCode.slice(1);
-
-				var sHWHID = this.hform.HWHID
-				var sHSPID = this.hform.HStockPlaceID
-				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)
-                if (HDeleteFlag == "*") {
-                    if (sBarCode == "") {
-                        uni.showToast({
-                        	title:'璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
-							icon:'none'
-                        })
-                    }else{
-						uni.request({
-						    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json', 
-							data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBarCode: sBarCode },
-						    success: (res) => {
-						        console.log('鍒犻櫎鏉$爜',res.data);
-								this.hform.HBarCode = ''
-								if(res.data.count == 1){
-									this.hform.HQty = ''
-									this.DisBillEntryList()
-								}else{
-									uni.showToast({
-										title:res.data.Message,
-										icon:'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title:'鎺ュ彛璇锋眰澶辫触',
-									icon:'none'
-								})
-							},
-						});
-					}
-                }else {
-                    var sBarCode = this.hform.HBarCode
-                    if (sHQty == "") {
-                        sHQty = 0;
-                    }
-					uni.request({
-					    url: this.serverUrl + '/WEBSController/Get_BarCode_Json', 
-						data: { sBarCode: sBarCode, HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBillNo: this.hform.HBillNo, HMaker: this.hform.HMaker, HWhID: sHWHID, HSPID: sHSPID, HQty: sHQty, HRedBlueFlag: this.hform.HRedBlueFlag, SourceFlag: HSourceFlag, HSourceBillNo: sSourceBillNo, HSourceBillType: sSourceBillType, HStockOrgID: this.hform.HStockOrgID, HScanStyle: "", HCustom1: "", HCustom2: "" },
-					    success: (res) => {
-					        console.log('鎵爜杩斿洖',res.data);
-							this.hform.HBarCode = ''
-							if(res.data.count == 1){
-								var data = res.data.data
-								if (data.hBarTypeField == '浠撳簱鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = ''
-									this.hform.HStockPlaceID = 0
-								    if (data.hSPFlagField == 0) {
-										this.showHStockPlaceName = false
-								    }else {
-										this.showHStockPlaceName = true
-								    }
-								}else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = data.hSPNameField
-									this.hform.HStockPlaceID = data.hSPIDField
-								}else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-									this.hform.HDeptName = data.hDeptNameField
-									this.hform.HDeptID = data.hDeptIDField
-								    this.tabs = 1
-								}else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-								    this.hform.HSupName = data.hSupNameField
-									this.hform.HSupID = data.hSupIDField
-								    if (data.hDeptIDField != 0) {
-										this.hform.HDeptID = data.hDeptIDField
-										this.hform.HDeptName = data.hDeptNameField
-								    }
-									this.hform.HSourceBillNo = data.hSourceBillNoField
-								    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-								    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
-									this.tabs = 2
-								}else {//鐗╂枡鏉$爜
-									this.tabs = 2
-									if(!this.hform.HSourceBillNo){
-										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
-										}
-										console.log(data)
-										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-										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
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-							}else{
-								uni.showToast({
-									title:res.data.Message,
-									icon:'none'
-								})
-							}
-						},
-						fail: (res) => {
-							console.log(res);
-							uni.showToast({
-								title:'鎺ュ彛璇锋眰澶辫触',
-								icon:'none'
-							})
-						},
-					});
-                }				
 			},
 			//鐗╂枡淇℃伅
 			DisBillEntryList(){
@@ -557,38 +315,6 @@
 					},
 				});
 			},
-			//鍒犻櫎鐗╂枡鐮�
-			delMater(item){
-				uni.showModal({
-				    title: '鎻愮ず',
-				    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-				    success: (res) => {
-				        if (res.confirm) {
-				            uni.request({
-				                url: this.serverUrl + '/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json', 
-				            	data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType,HSourceInterID:item.HSourceInterID,HSourceEntryID:item.HSourceEntryID,HSourceBarCodeCtl:this.hform.HSourceBarCodeCtl },
-				                success: (res) => {
-				            		if(res.data.count == 1){
-				            			this.DisBillEntryList()
-				            		}else{
-				            			uni.showToast({
-				            				title:res.data.Message,
-				            				icon:'none'
-				            			})
-				            		}
-				            	},
-				            	fail: (res) => {
-				            		console.log(res);
-				            		uni.showToast({
-				            			title:'鎺ュ彛璇锋眰澶辫触',
-				            			icon:'none'
-				            		})
-				            	},
-				            });
-				        }
-				    }
-				});
-			},
             submit() {
             	if(this.hform.HInterID == 0 ||!this.hform.HInterID){
             		uni.showToast({
@@ -623,7 +349,7 @@
 						})
 						var sMainStr = JSON.stringify(this.hform);
 						uni.request({
-						    url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_BillCheck_Json',
+						    url: this.serverUrl + '/WEBSController/set_SaveProductInBill_BillCheck_Json',
 							method:'POST',
 							dataType:"json",
 							data:{ oMain: sMainStr },
@@ -638,7 +364,7 @@
 									        if (res.confirm) {
 									            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 												uni.redirectTo({
-													url:'/pages/shengchanlingliao/form?OperationType=1'
+													url:'/pages/shengchanruku/form?OperationType=1'
 												})
 									        } else if (res.cancel) {
 									            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -824,4 +550,10 @@
 			}
 		}
 	}
+	.checkbox{
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shengchanruku/table.vue b/pages/shengchanruku/table.vue
index 16320a5..7347339 100644
--- a/pages/shengchanruku/table.vue
+++ b/pages/shengchanruku/table.vue
@@ -19,12 +19,6 @@
 					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
 				</view>
 			</view>
-			<view class="form-item">
-				<view class="title">婧愬崟鍗曞彿:</view>
-				<view class="right">
-					<input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-				</view>
-			</view>
 			<view class="buttons">
 				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
 				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
@@ -38,15 +32,6 @@
 				<view class="card-detail">
 					<view class="detail" v-if="item.鍒跺崟浜�">
 						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
-					</view>
-					<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
-						<text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
-					</view>
-					<view class="detail" v-if="item.鏁伴噺">
-						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-					</view>
-					<view class="detail" v-if="item.婧愬崟鍗曞彿">
-						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
 					</view>
 					<view class="detail" v-if="item.缁勭粐">
 						<text>缁勭粐锛�</text>{{item.缁勭粐}}
@@ -71,9 +56,6 @@
 					</view>
 					<view class="detail" v-if="item.鏁伴噺">
 						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-					</view>
-					<view class="detail" v-if="item.婧愬崟鍗曞彿">
-						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
 					</view>
 					<view class="detail" v-if="item.鐗╂枡浠g爜">
 						<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
@@ -111,12 +93,11 @@
 				userInfo:getUserInfo(),
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
 				tabs:0,
-				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
-				MvarReportTitle:'閿�鍞嚭搴撳崟缂撳瓨鍒楄〃',
+				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+				MvarReportTitle:'鐢熶骇鍏ュ簱鍗曟牎楠岀紦瀛樺垪琛�',
 				hform:{
 					HBillNo:'',
-					HSourceBillNo:'',
-					HBillType: 1205,
+					HBillType: 1202,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 				},
@@ -151,7 +132,7 @@
 				uni.request({
 				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
 					data:{ 
-						ModRightName: 'CE_SellOut',
+						ModRightName: 'CE_ProductInCheck',
 						HUserName: uni.getStorageSync('HUserName')
 					},
 				    success: (res) => {
@@ -183,10 +164,10 @@
 				this.showList = []
 				
 				if(this.tabs == 0){
-					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json'
+					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json'
 				}
 				if(this.tabs == 1){
-					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json'
 				}
 				this.getList()
 			},
@@ -247,8 +228,7 @@
 				this.sWhere = ''
 				this.hform = {
 					HBillNo:'',
-					HSourceBillNo:'',
-					HBillType: 1205,
+					HBillType: 1202,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 				}
@@ -262,32 +242,33 @@
 			//缂栬緫
 			edit(item){
 				console.log(item)
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-					data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
-							uni.navigateTo({
-								url:'./form?OperationType=2&HInterID=' + item.HInterID
-							})
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-	
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
+				uni.navigateTo({
+					url:'./form?OperationType=2&HBillNo=' + item.HBillNo
 				})
+	// 			uni.request({
+	// 			    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+	// 				data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
+	// 			    success: (res) => {
+	// 			        console.log(1,res);
+	// 					if(res.data.count == 1){
+							
+	// 					}else{
+	// 						uni.showToast({
+	// 							title:res.data.Message,
+	// 							icon:'none'
+	// 						})
+	// 					}
+	
+	// 				},
+	// 				fail: (res) => {
+	// 					console.log(res);
+	// 					uni.hideLoading()
+	// 					uni.showToast({
+	// 						title:'鎺ュ彛璇锋眰澶辫触',
+	// 						icon:'none'
+	// 					})
+	// 				},
+	// 			})
 			},
 			//鍒犻櫎
 			del(item){
@@ -299,12 +280,13 @@
 				        if (res.confirm) {
 				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.request({
-							    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_New_Json',
+							    url: this.serverUrl + '/WEBSController/DeleteTempBillList_BillCheck_Json',
 								data:{ 
 									HInterID: item.HInterID,
 									HBillNo: item.鍗曟嵁鍙�,
 									HBillType: this.hform.HBillType,
 									HMaker: uni.getStorageSync('HUserName'),
+									HStockOrgID:this.hform.HStockOrgID,
 									MvarReportTitle:this.MvarReportTitle,
 								},
 							    success: (res) => {
@@ -342,12 +324,13 @@
 				        if (res.confirm) {
 				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.request({
-							    url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+							    url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_BillCheck_Json',
 								data:{ 
 									HInterID: item.HInterID,
 									HBillNo: item.鍗曟嵁鍙�,
 									HBillType: this.hform.HBillType,
 									HMaker: uni.getStorageSync('HUserName'),
+									HStockOrgID:this.hform.HStockOrgID,
 									MvarReportTitle:this.MvarReportTitle,
 								},
 							    success: (res) => {
diff --git a/pages/shouliaotongzhi/table.vue b/pages/shouliaotongzhi/table.vue
index 2894430..c0992dc 100644
--- a/pages/shouliaotongzhi/table.vue
+++ b/pages/shouliaotongzhi/table.vue
@@ -72,6 +72,15 @@
 	    },
 		onLoad() {},
 	    methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
@@ -99,6 +108,7 @@
 							console.log('鎵爜杩斿洖',res.data.data);
 							this.HBarCode = ''
 							if(res.data.count == 1){
+								this.playSound(1)
 								var data = res.data.data
 								this.baseInfo = {
 									HBillNo:data[0].鍗曟嵁鍙�,
@@ -108,6 +118,7 @@
 								}
 								this.listData = data
 							}else{
+								this.playSound(0)
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -115,6 +126,7 @@
 							}
 						},
 						fail: (res) => {
+							this.playSound(0)
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index 32f4181..b4e17f4 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -354,6 +354,15 @@
 			this.getHDeptList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
@@ -770,6 +779,7 @@
 				console.log(this.hform.HSourceBillNo,HSourceFlag)
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
+						this.playSound(0)
                         uni.showToast({
                         	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
@@ -782,9 +792,11 @@
 						        console.log('鍒犻櫎鏉$爜',res.data);
 								this.hform.HBarCode = ''
 								if(res.data.count == 1){
+									this.playSound(1)
 									this.hform.HQty = ''
 									this.DisBillEntryList()
 								}else{
+									this.playSound(0)
 									uni.showToast({
 										title:res.data.Message,
 										icon:'none'
@@ -792,6 +804,7 @@
 								}
 							},
 							fail: (res) => {
+								this.playSound(0)
 								console.log(res);
 								uni.showToast({
 									title:'鎺ュ彛璇锋眰澶辫触',
@@ -812,6 +825,7 @@
 					        console.log('鎵爜杩斿洖',res.data);
 							this.hform.HBarCode = ''
 							if(res.data.count == 1){
+								this.playSound(1)
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉$爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -875,6 +889,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							}else{
+								this.playSound(0)
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -882,6 +897,7 @@
 							}
 						},
 						fail: (res) => {
+							this.playSound(0)
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/xiaoshoutuihuo/form.vue b/pages/xiaoshoutuihuo/form.vue
index b860403..9f57265 100644
--- a/pages/xiaoshoutuihuo/form.vue
+++ b/pages/xiaoshoutuihuo/form.vue
@@ -314,6 +314,15 @@
 			this.getHDeptList()
 		},
         methods: {
+			playSound(e){
+				const innerAudioContext = uni.createInnerAudioContext();
+				if(e == 1){
+					innerAudioContext.src = '/static/success.wav';
+				}else{
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
 			//鎵爜
 			toScanCode(){
 				uni.scanCode({
@@ -648,6 +657,7 @@
 				console.log(this.hform.HSourceBillNo,HSourceFlag)
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
+						this.playSound(0)
                         uni.showToast({
                         	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
@@ -660,9 +670,11 @@
 						        console.log('鍒犻櫎鏉$爜',res.data);
 								this.hform.HBarCode = ''
 								if(res.data.count == 1){
+									this.playSound(1)
 									this.hform.HQty = ''
 									this.DisBillEntryList()
 								}else{
+									this.playSound(0)
 									uni.showToast({
 										title:res.data.Message,
 										icon:'none'
@@ -670,6 +682,7 @@
 								}
 							},
 							fail: (res) => {
+								this.playSound(0)
 								console.log(res);
 								uni.showToast({
 									title:'鎺ュ彛璇锋眰澶辫触',
@@ -690,6 +703,7 @@
 					        console.log('鎵爜杩斿洖',res.data);
 							this.hform.HBarCode = ''
 							if(res.data.count == 1){
+								this.playSound(1)
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉$爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -753,6 +767,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							}else{
+								this.playSound(0)
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -760,6 +775,7 @@
 							}
 						},
 						fail: (res) => {
+							this.playSound(0)
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',

--
Gitblit v1.9.1