diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 552c0bbca..5929e084d 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -226,11 +226,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['productionLineCode'] = val[0]['code']
       }else if(formField == 'workStationCode'){
         row['workStationCode'] = val[0]['code']
+        row['fromLocationCode'] = val[0]['rawLocationCode']
       }else if(formField == 'processCode'){
         row['processCode'] = val[0]['code']
       }else if(formField == 'itemCode'){
         row['itemCode'] = val[0]['itemCode']
-        row['fromLocationCode'] = val[0]['rawLocationCode']
+
       }
     } else {
       const setV = {}
@@ -249,11 +250,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['productionLineCode'] = val[0]['code']
     }else if(formField == 'workStationCode'){
       setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['fgLocationCode']
     }else if(formField == 'processCode'){
       setV['processCode'] = val[0]['code']
     }else if(formField == 'itemCode'){
       setV['itemCode'] = val[0]['itemCode']
-      setV['fromLocationCode'] = val[0]['rawLocationCode']
     }
     formRef.setValues(setV)
   })