diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js
index 9e71a1648..2865f1ee0 100644
--- a/fe/PDA/common/basic.js
+++ b/fe/PDA/common/basic.js
@@ -21,7 +21,7 @@ export function getJobStatuDesc(val) {
 	else if (val == 4) return '部分完成'
 	else if (val == 8) return '关闭'
 	else if (val == 9) return '作废'
-	else if (val == 30) return '等待'
+	else if (val == 30) return '待库移'
 	else return '其他'
 }
 
diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
index 3a289e734..e8b814c83 100644
--- a/fe/PDA/pages/putaway/purchasePutaway.vue
+++ b/fe/PDA/pages/putaway/purchasePutaway.vue
@@ -430,10 +430,10 @@
 				label.handledProduceDate = balanceItem.produceDate;
 				label.handledExpireDate = balanceItem.expireDate;
 				label.handledLot = balanceItem.lot;
-				label.handledToLocationCode = balanceItem.locationCode;
-				label.handledToLocationArea = balanceItem.locationArea;
-				label.handledToLocationGroup = balanceItem.locationGroup;
-				label.handledToLocationErpCode = balanceItem.locationErpCode;
+				// label.handledToLocationCode = balanceItem.locationCode;
+				// label.handledToLocationArea = balanceItem.locationArea;
+				// label.handledToLocationGroup = balanceItem.locationGroup;
+				// label.handledToLocationErpCode = balanceItem.locationErpCode;
 				label.handledToWarehouseCode = balanceItem.warehouseCode;
 				label.handledQty = balanceItem.qty;
 
@@ -536,6 +536,12 @@
 						r.toLocationGroup = this.location.locationGroupCode;
 						r.toLocationArea = this.location.areaCode;
 						r.toLocationErpCode = this.location.erpLocationCode;
+						
+						r.handledToLocationCode = this.location.code;
+						r.handledToLocationArea = this.location.areaCode;
+						r.handledToLocationGroup = this.location.locationGroupCode;
+						r.handledToLocationErpCode =  this.location.erpLocationCode;
+						
 						item.details.push(r);
 					})
 				})
diff --git a/fe/PDA/pages/return/returnBeforPutaway.vue b/fe/PDA/pages/return/returnBeforPutaway.vue
index 10d7c7474..3891299d3 100644
--- a/fe/PDA/pages/return/returnBeforPutaway.vue
+++ b/fe/PDA/pages/return/returnBeforPutaway.vue
@@ -210,6 +210,7 @@
 				let that = this;
 				let item = {
 					returnReason: this.returnReason,
+					worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
 					details: []
 				}
 				that.itemList.forEach(r => {
diff --git a/fe/PDA/pages/task/assembleIssueJob.vue b/fe/PDA/pages/task/assembleIssueJob.vue
index 35783c7bc..5f60bf769 100644
--- a/fe/PDA/pages/task/assembleIssueJob.vue
+++ b/fe/PDA/pages/task/assembleIssueJob.vue
@@ -69,7 +69,7 @@
 				isToday: false,
 				titleArray: ['任务编号'],
 				loadingType: "nomore",
-				taps:["全部","待处理","等待"],
+				taps:["全部","待处理","待库移"],
 				current:0
 			};
 		},
diff --git a/fe/PDA/pages/task/coatingIssuleJob.vue b/fe/PDA/pages/task/coatingIssuleJob.vue
index 664f982e0..3e7f59bf6 100644
--- a/fe/PDA/pages/task/coatingIssuleJob.vue
+++ b/fe/PDA/pages/task/coatingIssuleJob.vue
@@ -71,7 +71,7 @@
 				isToday: false,
 				titleArray: ['任务编号'],
 				loadingType: "nomore",
-				taps:["全部","待处理","等待"],
+				taps:["全部","待处理","待库移"],
 				current:0
 			};
 		},
diff --git a/fe/PDA/pages/task/injectionIssueJob.vue b/fe/PDA/pages/task/injectionIssueJob.vue
index 8404ed834..5e30ee012 100644
--- a/fe/PDA/pages/task/injectionIssueJob.vue
+++ b/fe/PDA/pages/task/injectionIssueJob.vue
@@ -69,7 +69,7 @@
 				isToday: false,
 				titleArray: ['任务编号'],
 				loadingType: "nomore",
-				taps:["全部","待处理","等待"],
+				taps:["全部","待处理","待库移"],
 				current:0
 			};
 		},
diff --git a/fe/PDA/pages/task/kittingIssueJob.vue b/fe/PDA/pages/task/kittingIssueJob.vue
index 82c3b8f2d..bf9cf6764 100644
--- a/fe/PDA/pages/task/kittingIssueJob.vue
+++ b/fe/PDA/pages/task/kittingIssueJob.vue
@@ -69,7 +69,7 @@
 				isToday: false,
 				titleArray: ['任务编号'],
 				loadingType: "nomore",
-				taps:["全部","待处理","等待"],
+				taps:["全部","待处理","待库移"],
 				current:0
 			};
 		},
diff --git a/fe/PDA/pages/task/sparePartIssueJob.vue b/fe/PDA/pages/task/sparePartIssueJob.vue
index c1613785e..effc8ab5b 100644
--- a/fe/PDA/pages/task/sparePartIssueJob.vue
+++ b/fe/PDA/pages/task/sparePartIssueJob.vue
@@ -69,7 +69,7 @@
 				isToday: false,
 				titleArray: ['任务编号'],
 				loadingType: "nomore",
-				taps:["全部","待处理","等待"],
+				taps:["全部","待处理","待库移"],
 				current:0
 			};
 		},