From 75b978419dc23ddedd3bcb808bc1821e999b657b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 19 八月 2025 16:59:28 +0800
Subject: [PATCH] 修改 收料通知单 条码生成规则

---
 pages/shouliaotongzhi/table_son.vue |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/pages/shouliaotongzhi/table_son.vue b/pages/shouliaotongzhi/table_son.vue
index 6a51955..89a8f28 100644
--- a/pages/shouliaotongzhi/table_son.vue
+++ b/pages/shouliaotongzhi/table_son.vue
@@ -39,8 +39,8 @@
 			</view>
 			<view class="form-item">
 				<view class="title">姣忕鏁伴噺:</view>
-				<view class="right">
-					<input v-model="baseInfo.HMinQty" type="number" placeholder="璇疯緭鍏ユ暟閲�"  @confirm="getNum()" @blur="getNum()"/>
+				<view class="righton">
+					<input disabled="" v-model="baseInfo.HMinQty" type="number" placeholder="璇疯緭鍏ユ暟閲�"  @confirm="getNum()" @blur="getNum()"/>
 				</view>
 			</view>
 			<view class="form-item">
@@ -142,17 +142,29 @@
 				linterid:'',
 				HEntryID:'',
 				baseInfo:{
-					HBillNo:'',
 					HMainID:'',
 					HSubID:'',
-					HOrderBillNo:'',
+					HBillNo:'',
 					HMaterID:'',
 					HMaterNumber:'',
 					HMaterName:'',
 					HMaterModel:'',
 					HQty:'',
-					HMinQty:'',
-					HBQty:'',
+					HMinQty: '',
+					HSupID:'',
+					SHdate:'',
+					HMTONo: '',
+					HBatchNo: '',
+					HBQty: '',
+					HSupID: '',
+					HSupNumber: '',
+					HSupName: '',
+					HUnitID: '',
+					HPcsName: '',
+					HSupNameShort: '',
+					HMTONo: '',
+					HDate: '',
+					HSourceBillNo: '',
 				},
 				sWhere:'',
 				listData:[],
@@ -206,15 +218,28 @@
 							console.log(data)
 							this.baseInfo = {
 								HMainID:data[0].linterid,
-								HSubID:data[0].HEntryID,
+								HSubID:data[0].hsubid,
 								HBillNo:data[0].鍗曟嵁鍙�,
+								HSourceBillNo: data[0].鍗曟嵁鍙�,
 								HMaterID:data[0].HMaterID,
 								HMaterNumber:data[0].鐗╂枡浠g爜,
 								HMaterName:data[0].鐗╂枡鍚嶇О,
 								HMaterModel:data[0].瑙勬牸鍨嬪彿,
 								HQty:data[0].鏁伴噺,
+								HMinQty: data[0].鏁伴噺,
 								HSupID:data[0].HSupID,
 								SHdate:data[0].瀹℃牳鏃ユ湡,
+								HBatchNo: data[0]['鎵瑰彿'],
+								HBQty: data[0]['鏁伴噺'],
+								HSupID: data[0]['HSupID'],
+								HSupNumber: data[0]['渚涘簲鍟嗕唬鐮�'],
+								HSupName: data[0]['渚涘簲鍟�'],
+								HUnitID: data[0]['HUnitID'],
+								HPcsName: data[0]['璁¢噺鍗曚綅'],
+								HSupNameShort: data[0]['渚涘簲鍟�'],
+								HMTONo: data[0]['璁″垝璺熻釜鍙�'].trim(),
+								HDate: data[0]['鏃ユ湡'],
+								
 							}
 						}else{
 							uni.showToast({
@@ -245,6 +270,8 @@
 				}
 			},
 			getList(){
+				let HBarCodeNoStr =
+					`${this.baseInfo.HBillNo}@${this.baseInfo.HSubID}@${this.baseInfo.HMaterNumber || ''}@${this.baseInfo.HMTONo || ''}@${this.baseInfo.HQty || 0}`
 				var sMain = []
 				sMain[0] = this.baseInfo
 				var sMainStr = JSON.stringify(sMain);
@@ -255,12 +282,13 @@
 				//鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
 				var HSourceBillType = "鏀舵枡閫氱煡鍗�";
 				//鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
-				var HSelectBarCodeType = "鍞竴鏉$爜";
+				var HSelectBarCodeType = "鍝佺鏉$爜";
 				//鑾峰彇褰撳墠鐧诲綍浜哄憳
 				var UserName = uni.getStorageSync('HUserName');                
-				var sMainSub = sMainStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
+				let sMainSub = sMainStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' +
+					CampanyName + ';' + UserName + ';' + HBarCodeNoStr +'; ' + '; ' + '; ';
 				uni.request({
-				    url: this.serverUrl + '/Sc_BarCode/Sub_SaveBill', 
+				    url: this.serverUrl + '/Sc_BarCode/SaveBarCode_NoGenerate', 
 					method:'POST',
 					data: { msg: sMainSub, CampanyName: CampanyName },
 				    success: (res) => {

--
Gitblit v1.9.1