diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index ae8988f6..368c5b47 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1069,7 +1069,9 @@ export default {
         this.findMethod();
       } else if (this.curAction.corpType == 3) {
         //2. 切换往来仓库
-        this.orderFormData.fromInvCode = null;
+        if (this.orderQuery == null || this.orderQuery.billNo == null){
+          this.orderFormData.fromInvCode = null;
+        }
         this.findFromInvList();
       }
       if (this.curAction.scanPreIn && this.curAction.backPreinType == 1 && this.curAction.preInBack) {
@@ -1129,7 +1131,7 @@ export default {
       findByFrom(cQuery)
         .then((response) => {
           this.fromInvOptions = response.data || [];
-          if (val == 1) {
+          if (this.fromInvOptions.length == 1) {
             this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
           }
         })