增加出库单的修改功能。

完善从“入库"到"库存"到"出库"到"拣货"  四个功能模块 关于库位、仓库的同步和验证  保证出库时仓位的准确。
增加仓位的对外查询接口 根据仓库查询。
前端后端联调测试，沟通需求整理测试问题。

warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue

@@ -79,7 +79,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <el-select v-model="purchaseForm.custId" placeholder="请选择"  style="width: 100%;" >
+                <el-select v-model="purchaseForm.custId" placeholder="请选择" @change="setCustername(purchaseForm.custId)"  style="width: 100%;" >
                  <el-option
                    v-for="(custName,i) in custList"
                    :key="i"
@@ -269,6 +269,17 @@
         this.openAddPurchaseDialog()
     },
     methods: {
+      setCustername(v){
+        console.log(v);
+        console.log(this.custList);
+        this.custList.forEach((e) => {
+          console.log(e);
+          if(e.sid==v){
+           this.purchaseForm.custName=e.enterpriseName
+          }
+        });
+        console.log(this.purchaseForm);
+      },
       selectPro(row){
         this.productList.forEach((e) => {
           if(e.barCode==row.proId){
@@ -308,11 +319,11 @@
             this.purchaseForm.storehouseName = v.name
           }
         })
-        this.custList.forEach((v, i) => {
-          if(v.custId == this.purchaseForm.custId){
-            this.purchaseForm.custName = v.enterpriseName
-          }
-        })
+        // this.custList.forEach((v, i) => {
+        //   if(v.custId == this.purchaseForm.custId){
+        //     this.purchaseForm.custName = v.enterpriseName
+        //   }
+        // })
         this.supplierList.forEach((v, i) => {
           if(v.name == this.purchaseForm.supplierId){
             this.purchaseForm.supplierName = v.name

warehousing-system/project_web_ui/src/views/component/instorehouse/putIn.vue

@@ -13,7 +13,6 @@
             placeholder="请选择"
             class="item_input"
             clearable
-            @change="getOptions"
           >
             <el-option
               v-for="(item,i) in dingdanId"
@@ -32,7 +31,7 @@
             placeholder="请选择入库区货位"
             class="item_input"
             clearable
-            @change="getOptions"
+            @change="setOptions(inStorehouse.locationId)"
           >
             <el-option
               v-for="(item,i) in huoweiId"
@@ -84,6 +83,7 @@ export default {
         inStorehouseId: "",
         receivingId: "",
         locationId: "",
+        locationNumber: "",
         remarks: "",
         no:'',
         storeHouseSid:"",
@@ -125,6 +125,13 @@ export default {
     };
   },
   methods: {
+    setOptions(locationId){
+      this.huoweiId.forEach((e) => {
+        if(e.locationId==locationId){
+          this.inStorehouse.locationName=e.name
+        }
+      });
+    },
     btnHandle(btnKey) {
 			switch (btnKey) {
 			   case 'doClose': // 关闭
@@ -138,7 +145,7 @@ export default {
       const { data: result } = await this.$http.post('/purchasenew/listAll', { params: this.queryInfos })
       const { data: datas } = await this.$http.get('/location/listAll', { params: this.queryPamas })
       this.dingdanId = result.data;
-      this.huoweiId = datas.data.rows;
+      this.huoweiId = datas.data;
     },
 
     addInStorehouse() {
@@ -150,22 +157,24 @@ export default {
         this.inStorehouse.inStorehouseId = "IN" + now.getTime();
         this.inStorehouse.no = this.inStorehouse.receivingId
         this.inStorehouse.storeHouseSid = this.inStorehouse.locationId
-        let location =this.huoweiId.find((item)=>{
-          return item.locationId === this.inStorehouse.locationId;//筛选出匹配数据
-        })
-        this.inStorehouse.storeHouseName= location.name;
+        // let location =this.huoweiId.find((item)=>{
+        //   return item.locationId === this.inStorehouse.locationId;//筛选出匹配数据
+        // })
+        // this.inStorehouse.storeHouseName= location.name;
         // const { data: result } = await this.$http.post('/putIn/addInStorehouse', this.inStorehouse)
         const { data: result } = await this.$http.post(
           "/input/addInStorehouse",
           this.inStorehouse
         );
-        if (result.code != 200){
-          this.$message.error(result.msg)
+        if (result.code == 200){
+          this.$message.success('操作成功')
+          this.getOptions();
+          this.$refs.onPutInRuleForm.resetFields();
           return ;
         }
-        this.$message.success('操作成功')
-        this.getOptions();
-        this.$refs.onPutInRuleForm.resetFields();
+        this.$message.error(result.msg)
+        return;
+
       });
 
     },

warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue

@@ -80,7 +80,7 @@
             </el-col>
             <el-col :span="8">
             <el-form-item class="trightb_item">
-             <el-select v-model="purchaseForm.storeHouseSid" placeholder="请选择"  style="width: 100%;">
+             <el-select v-model="purchaseForm.storeHouseSid"  @change="selectstorehouse(purchaseForm)"   placeholder="请选择"  style="width: 100%;">
                  <el-option
                    v-for="(storehouse,i) in storehouseList"
                    :key="i"
@@ -97,7 +97,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <el-date-picker v-model="purchaseForm.purchaseDate" type="date" style="width: 100%;"
+                <el-date-picker v-model="purchaseForm.outDate" type="date" style="width: 100%;"
                   format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
               </el-form-item>
             </el-col>
@@ -139,7 +139,7 @@
                 </el-table-column>
                 <el-table-column label="单价(元)" width="140" prop="estimateconfirmedPrice" align="center">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.estimateconfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
+                    <el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column label="出库价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
@@ -158,11 +158,11 @@
                   </template>-->
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.locationNumber"
+                      v-model="scope.row.locationId"
                       placeholder="请选择入库区货位"
                       class="item_input"
                       clearable
-                      @change="getOptions"
+                      @change="setOptions(scope.row)"
                     >
                       <el-option
                         v-for="(item,i) in huoweiId"
@@ -200,17 +200,19 @@
       return {
         viewTitle: "【新增】出库订单",
         purchaseForm: {
+          sid:'',
            purchaseId: '',
            product: '',
            barCode: '',
            applicationDate:'',
            no:'',
            creatorName:'',
-           storehouseName:'',
+          storeHouseName:'',
            storeHouseSid:"",
            custerName:'',
            custerSid:'',
-           list:[]
+           list:[],
+          outDate:""
         },
         huoweiId:[],
         supplierList: [],
@@ -248,11 +250,26 @@
         this.getStorehouseList()
         this.getcustListList()
         this.openAddPurchaseDialog()
+      this.getOptions();
     },
     methods: {
+      selectstorehouse(form){
+        this.storehouseList.forEach((e) => {
+          if(e.sid==form.storeHouseSid){
+            form.storeHouseName=e.name
+          }
+        });
+      },
+      setOptions(value){
+          this.huoweiId.forEach((e) => {
+            if(e.locationId==value.locationId){
+              value.locationNumber=e.name
+            }
+          });
+      },
       async getOptions() {
         const { data: datas } = await this.$http.get('/location/listAll', { params: this.queryPamas })
-        this.huoweiId = datas.data.rows;
+        this.huoweiId = datas.data;
       },
       selectPro(row){
         console.log(row);
@@ -276,7 +293,7 @@
            applicationDate:'',
            no:'',
            creatorName:'',
-           storehouseName:'',
+          storeHouseName:'',
            storeHouseSid:"",
            custerName:'',
            custerSid:'',
@@ -284,11 +301,11 @@
          }
       },
       saveOrUpdate(){
-        this.storehouseList.forEach((v, i) => {
-          if(v.sid == this.purchaseForm.storeHouseSid){
-            this.purchaseForm.storehouseName = v.name
-          }
-        })
+        // this.storehouseList.forEach((v, i) => {
+        //   if(v.sid == this.purchaseForm.storeHouseSid){
+        //     this.purchaseForm.storehouseName = v.name
+        //   }
+        // })
         this.custList.forEach((v, i) => {
           if(v.enterpriseName == this.purchaseForm.custerSid){
             this.purchaseForm.custerName = v.enterpriseName

warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue

@@ -47,7 +47,7 @@
         width="180">
       </el-table-column>
       <el-table-column
-        prop="storehouseName"
+        prop="storeHouseName"
         label="仓库名称"
         align="center"
         width="180">
@@ -186,7 +186,7 @@ methods: {
       current: 1,
       size: 10,
       params: {
-        no:'' 
+        no:''
       },
     },
     this.getPurchaseList()