diff --git a/.env.development b/.env.development
index c00b9fbb..0c16a8bc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,2 @@
-
-VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
-VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api
\ No newline at end of file
+VITE_BASE_URL=http://192.168.0.113:12080/admin-api
+VITE_BASE_URL_IMAGE=http://192.168.0.113:12080/admin-api
\ No newline at end of file
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 03e2fc81..6fb00480 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -62,12 +62,13 @@
 		navigateBack,
 		updateTitle,
 		getPackingNumberAndBatch,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 
 	import {
 		getInventoryStatusName,
 		getInventoryStatusDesc,
-		getDirectoryItemArray
+		getDirectoryItemArray,
 	} from '@/common/directory.js';
 	import {
 		getLocationTypeArray
@@ -289,6 +290,10 @@
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")
 							} else {
+
+								this.addDetail(itemDetail, result);
+								return;
+								//暂时先不判断状态
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
@@ -296,32 +301,30 @@
 										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
-													itemDetail.scaned = true;
-													itemDetail.handleQty = Number(result.balance.qty)
-													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-													itemDetail.balance = result.balance;
-													itemDetail.balance.balanceQty = Number(result.balance.qty)
-													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.packUnit = result.package.packUnit
-													this.calcHandleQty();
+													this.addDetail(itemDetail, result);
+													// itemDetail.scaned = true;
+													// itemDetail.handleQty = Number(result.balance.qty)
+													// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													// itemDetail.balance = result.balance;
+													// itemDetail.balance.balanceQty = Number(result.balance.qty)
+													// itemDetail.balance.packQty = Number(result.package.packQty)
+													// itemDetail.balance.packUnit = result.package.packUnit
+													// this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
-									} else {
-
 									}
-
-
 								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.balance.qty)
-									itemDetail.balance = result.balance;
-									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-									itemDetail.balance.balanceQty = Number(result.balance.qty)
-									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.packUnit = result.package.packUnit
-									this.calcHandleQty();
+									this.addDetail(itemDetail, result);
+									// itemDetail.scaned = true;
+									// itemDetail.handleQty = Number(result.balance.qty)
+									// itemDetail.balance = result.balance;
+									// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									// itemDetail.balance.balanceQty = Number(result.balance.qty)
+									// itemDetail.balance.packQty = Number(result.package.packQty)
+									// itemDetail.balance.packUnit = result.package.packUnit
+									// this.calcHandleQty();
 								}
 							}
 						}
@@ -331,6 +334,17 @@
 				}
 			},
 
+			addDetail(itemDetail, result) {
+				itemDetail.scaned = true;
+				itemDetail.handleQty = Number(result.balance.qty)
+				itemDetail.balance = result.balance;
+				itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+				itemDetail.balance.balanceQty = Number(result.balance.qty)
+				itemDetail.balance.packQty = Number(result.package.packQty)
+				itemDetail.balance.packUnit = result.package.packUnit
+				this.calcHandleQty();
+			},
+
 			scanLocationCode(location, code) {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index 57105a1e..93010b71 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -74,7 +74,7 @@
 		props: {
 			type: 'assemble',
 		},
-		
+
 		mounted() {
 			this.getList('refresh');
 		},
@@ -151,7 +151,7 @@
 					action: "in",
 					value: this.status
 				})
-				
+
 				filters.push({
 					column: "type",
 					action: "==",
@@ -202,7 +202,8 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './productPutawayDetail?id=' + item.id + '&type=' + item.type
+					url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
+						.type
 				});
 			},
 
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index a54e75db..bb21bdb2 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -148,7 +148,6 @@
 				} else {
 					this.getDetail();
 				}
-
 			}
 		},
 		//返回首页