From 47b3d54a13f8b9b6ca770cacb3d6171bc38d80e4 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 11 May 2023 11:30:53 +0800
Subject: [PATCH 1/3] 2023-5-11

---
 .../yxt-supervise-cyf-ui/.env.development     |  2 +-
 .../flowInstrument/flowInstrumentAdd.vue      |  4 +-
 .../views/baseInfo/flowInstrument/index.vue   |  4 +-
 .../src/views/baseInfo/oilTank/oilTankAdd.vue | 79 ++++++++++++++---
 .../flowInstrument/flowInstrumentAdd.vue      |  4 +-
 .../src/views/flowInstrument/index.vue        |  4 +-
 .../views/supervise/oilTypeOutBound/index.vue | 86 +++++++++----------
 .../views/supervise/recordOilTank/index.vue   |  8 +-
 8 files changed, 124 insertions(+), 67 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
index 06b4751d..8a48175f 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.3.173:7101"
+VUE_APP_URL = "http://192.168.1.193:7101"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
index ce2539a0..316eac39 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
@@ -28,12 +28,12 @@
           <span class="item_text">流量仪器Code：</span>
           <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
         </div>
-        <div class="item">
+       <!-- <div class="item">
           <span class="item_text">油罐编号：</span>
          <el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
            <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
          </el-select>
-        </div>
+        </div> -->
       </el-card>
 
     </div>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
index 9abf3b0d..ee625b48 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
@@ -37,8 +37,8 @@
             <el-table-column label="流量仪器名称" prop="name" align="center" />
             <el-table-column label="流量仪器编码" prop="number" align="center" />
             <el-table-column label="流量仪器Code" prop="code" align="center" />
-            <el-table-column label="油罐编号" prop="tankNumber" align="center" />
-            <el-table-column label="原油编码" prop="crudeNumber" align="center" />
+          <!--  <el-table-column label="油罐编号" prop="tankNumber" align="center" />
+            <el-table-column label="原油编码" prop="crudeNumber" align="center" /> -->
           </el-table>
         </div>
         <div class="pages">
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
index 2d915056..15076bb4 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
@@ -22,17 +22,24 @@
         </div>
         <div class="item">
           <span class="item_text">原油类型：</span>
-          <el-select v-model="formobj.crudeName" filterable placeholder="请选择原油类型" class="item_input"
-            @change="getType">
+          <el-select v-model="formobj.crudeName" filterable placeholder="请选择原油类型" class="item_input" @change="getType">
             <el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
           </el-select>
           <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
         </div>
         <div class="item">
           <span class="item_text">原油编号：</span>
-           <el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
+          <el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
           <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
         </div>
+        <div class="item">
+          <span class="item_text">流量仪器：</span>
+          <el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
+            @change="getFlowmeter">
+            <el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
+          </el-select>
+          <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
+        </div>
         <div class="item">
           <span class="item_text">油罐容量：</span>
           <el-input v-model="formobj.capacity" placeholder="" class="item_input" clearable />
@@ -41,6 +48,18 @@
           <span class="item_text">油罐库存：</span>
           <el-input v-model="formobj.initialInventory" placeholder="" class="item_input" clearable />
         </div>
+        <div class="item">
+          <span class="item_text">油罐底面积：</span>
+          <el-input v-model="formobj.bottomArea" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">原油密度：</span>
+          <el-input v-model="formobj.density" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">油罐高度：</span>
+          <el-input v-model="formobj.height" placeholder="" class="item_input" clearable />
+        </div>
       </el-card>
 
     </div>
@@ -50,35 +69,44 @@
 
 <script>
   import req from '@/api/oilTank/oilTank'
+  import req2 from '@/api/flowInstrument/flowInstrument'
   export default {
     data() {
       return {
         submitdisabled: false,
-        crudeLists:[],
-        crudeList:[],
+        crudeLists: [],
+        crudeList: [],
+        flowmeterLists: [],
+        flowmeterList: [],
         formobj: {
           sid: "",
           number: "",
           crudeSid: "",
           crudeName: "",
           crudeNumber: "",
+          flowmeterSid: "",
+          flowmeterName: "",
           capacity: "",
           tankPipeline: "",
           initialInventory: "",
+          bottomArea: "",
+          density: "",
+          height: "",
 
         }
       }
     },
     created() {
       this.crudeinfoList()
+      this.getFlowmeterList()
     },
     methods: {
       crudeinfoList() {
-       req.crudeinfoList().then((res) => {
+        req.crudeinfoList().then((res) => {
           if (res.success) {
-             console.log(">>>>>>>>>2222222", res.data)
+            console.log(">>>>>>>>>2222222", res.data)
             this.crudeLists = res.data
-            for (var i = 0; i <this.crudeLists.length; i++) {
+            for (var i = 0; i < this.crudeLists.length; i++) {
 
               let item = {
                 name: this.crudeLists[i].name,
@@ -91,6 +119,25 @@
           }
         })
       },
+      getFlowmeterList() {
+        console.log(">>>>>>>>>111111111111wwwwwwwwww")
+        req2.flowmeterList().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
+            this.flowmeterLists = res.data
+            for (var i = 0; i < this.flowmeterLists.length; i++) {
+
+              let item = {
+                name: this.flowmeterLists[i].number,
+                sid: this.flowmeterLists[i].sid,
+
+              }
+              this.flowmeterList.push(item)
+            }
+
+          }
+        })
+      },
       saveOrUpdate() {
         req.addInfo(this.formobj)
           .then(resp => {
@@ -113,12 +160,17 @@
         this.formobj = {
           sid: "",
           number: "",
-          crudeSid:"",
+          crudeSid: "",
           crudeName: "",
           crudeNumber: "",
+          flowmeterSid: "",
+          flowmeterName: "",
           capacity: "",
           tankPipeline: "",
           initialInventory: "",
+          bottomArea: "",
+          density: "",
+          height: "",
 
         }
         this.$emit('doback')
@@ -126,11 +178,18 @@
       getType(value) {
         console.log(">>>>>>>>>getType", value)
         const choose = this.crudeLists.filter((item) => item.sid === value)
-         console.log(">>>>>>>>>getType", choose[0])
+        console.log(">>>>>>>>>getType", choose[0])
         // this.formobj.crudeSid = choose[0].sid
         this.formobj.crudeNumber = choose[0].number
         this.formobj.crudeSid = value
       },
+      getFlowmeter(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.flowmeterLists.filter((item) => item.sid === value)
+        console.log(">>>>>>>>>getType", choose[0])
+        this.formobj.flowmeterSid = choose[0].sid
+        this.formobj.flowmeterName = choose[0].number
+      },
     }
   }
 </script>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue
index 0014d1cb..9843e505 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue
@@ -28,12 +28,12 @@
           <span class="item_text">流量仪器Code：</span>
           <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
         </div>
-        <div class="item">
+        <!-- <div class="item">
           <span class="item_text">油罐编号：</span>
          <el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
            <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
          </el-select>
-        </div>
+        </div> -->
       </el-card>
 
     </div>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue
index 9abf3b0d..201f85cb 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue
@@ -37,8 +37,8 @@
             <el-table-column label="流量仪器名称" prop="name" align="center" />
             <el-table-column label="流量仪器编码" prop="number" align="center" />
             <el-table-column label="流量仪器Code" prop="code" align="center" />
-            <el-table-column label="油罐编号" prop="tankNumber" align="center" />
-            <el-table-column label="原油编码" prop="crudeNumber" align="center" />
+            <!-- <el-table-column label="油罐编号" prop="tankNumber" align="center" /> -->
+            <!-- <el-table-column label="原油编码" prop="crudeNumber" align="center" /> -->
           </el-table>
         </div>
         <div class="pages">
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
index 87c587cd..1888d0bc 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
@@ -31,21 +31,20 @@
             value-format="yyyy-MM-dd" placeholder="请选择" />
         </div>
         <div class="item">
-          <span class="item_text">流量仪器：</span>
-          <el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
-            @change="getFlowmeter">
-            <el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
+          <span class="item_text">油罐编号：</span>
+          <el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
+            <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
           </el-select>
           <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
         </div>
         <div class="item">
-          <span class="item_text">油罐编号：</span>
-          <el-input v-model="formobj.tankName" placeholder="" :readonly="true" class="item_input" clearable />
+          <span class="item_text">原油编号：</span>
+          <el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
           <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
         </div>
         <div class="item">
-          <span class="item_text">原油编号：</span>
-          <el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
+          <span class="item_text">流量仪器：</span>
+          <el-input v-model="formobj.flowmeterName" placeholder="" :readonly="true" class="item_input" clearable />
           <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
         </div>
         <div class="item">
@@ -69,21 +68,20 @@
 
 <script>
   import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
-  import req2 from '@/api/flowInstrument/flowInstrument'
   export default {
     data() {
       return {
         submitdisabled: false,
-        flowmeterLists: [],
-        flowmeterList: [],
+        tankLists: [],
+        tankList: [],
         formobj: {
           sid: "",
           salesContractNumber: "",
           contractSigningDate: "",
           deliveryDate: "",
-          flowmeterSid: "",
-          flowmeterName: "",
+          tankSid: "",
           tankName: "",
+          flowmeterName: "",
           oilType: "",
           weight: "",
           value: "",
@@ -94,23 +92,22 @@
     },
     created() {
       console.log(">>>>>>>>>created")
-      this.getFlowmeterList()
+      this.getTankList()
     },
     methods: {
-      getFlowmeterList() {
-        console.log(">>>>>>>>>111111111111wwwwwwwwww")
-        req2.flowmeterList().then((res) => {
+      getTankList() {
+        req.tankList().then((res) => {
           if (res.success) {
             console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
-            this.flowmeterLists = res.data
-            for (var i = 0; i < this.flowmeterLists.length; i++) {
+            this.tankLists = res.data
+            for (var i = 0; i < this.tankLists.length; i++) {
 
               let item = {
-                name: this.flowmeterLists[i].number,
-                sid: this.flowmeterLists[i].sid,
+                name: this.tankLists[i].number,
+                sid: this.tankLists[i].sid,
 
               }
-              this.flowmeterList.push(item)
+              this.tankList.push(item)
             }
 
           }
@@ -125,20 +122,20 @@
                 type: 'success',
                 message: resp.msg
               })
-            this.formobj = {
-              sid: "",
-              salesContractNumber: "",
-              contractSigningDate: "",
-              deliveryDate: "",
-              flowmeterSid: "",
-              flowmeterName: "",
-              tankName: "",
-              oilType: "",
-              weight: "",
-              value: "",
-              remarks: "",
-            
-            }
+              this.formobj = {
+                sid: "",
+                salesContractNumber: "",
+                contractSigningDate: "",
+                deliveryDate: "",
+                tankSid: "",
+                tankName: "",
+                flowmeterName: "",
+                oilType: "",
+                weight: "",
+                value: "",
+                remarks: "",
+
+              }
             } else {
               // 根据resp.code进行异常情况处理
             }
@@ -146,17 +143,18 @@
           .catch(() => {})
 
       },
-     handleReturn() {
+      handleReturn() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
-     },
-      getFlowmeter(value) {
+      },
+      getTank(value) {
         console.log(">>>>>>>>>getType", value)
-        const choose = this.flowmeterLists.filter((item) => item.sid === value)
+        const choose = this.tankLists.filter((item) => item.sid === value)
         console.log(">>>>>>>>>getType", choose[0])
-        this.formobj.flowmeterSid = choose[0].sid
-        this.formobj.tankName = choose[0].tankNumber
-        this.formobj.oilType = choose[0].crudeNumber
+        this.formobj.tankSid = choose[0].sid
+        this.formobj.oilType = choose[0].crudeName
+        this.formobj.flowmeterName = choose[0].flowmeterName
+
       },
     }
   }
@@ -223,4 +221,4 @@
     }
 
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue
index a36454fc..5ab8580e 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue
@@ -23,8 +23,8 @@
           </el-select>
         </div>
         <div class="item">
-          <span class="item_text">油罐库存：</span>
-          <el-input v-model="formobj.existingInventory" placeholder="" class="item_input" clearable />
+          <span class="item_text">油罐库存高度：</span>
+          <el-input v-model="formobj.height" placeholder="" class="item_input" clearable />
         </div>
       </el-card>
 
@@ -45,7 +45,7 @@
         formobj: {
           tankName: "",
           tankSid: "",
-          existingInventory: ""
+          height: ""
         }
       }
     },
@@ -84,7 +84,7 @@
               this.formobj = {
                 tankName: "",
                 tankSid: "",
-                existingInventory: "",
+                height: "",
 
               }
             } else {

From 1bd9e014308471fd00f9f6e09a7c3970f5663b29 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 11 May 2023 11:33:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=9F=E6=B2=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrudeOilInventoryRecord.java                     |  1 +
 .../CrudeOilInventoryRecordDetailsVo.java            |  1 +
 .../CrudeOilInventoryRecordDto.java                  |  1 +
 .../CrudeOilInventoryRecordQuery.java                |  1 +
 .../CrudeOilInventoryRecordVo.java                   |  1 +
 .../cyf/api/crudeoiloutbound/CrudeOilOutbound.java   |  4 ++--
 .../crudeoiloutbound/CrudeOilOutboundDetailsVo.java  |  4 ++--
 .../api/crudeoiloutbound/CrudeOilOutboundDto.java    |  5 ++---
 .../api/crudeoiloutbound/CrudeOilOutboundQuery.java  |  4 ++--
 .../cyf/api/tankinformation/TankInformation.java     |  8 ++++++++
 .../tankinformation/TankInformationDetailsVo.java    |  8 ++++++++
 .../cyf/api/tankinformation/TankInformationDto.java  |  8 ++++++++
 .../api/tankinformation/TankInformationQuery.java    |  8 ++++++++
 .../cyf/api/tankinformation/TankInformationVo.java   | 10 ++++++++++
 .../CrudeOilInventoryRecordService.java              |  5 +++--
 .../biz/crudeoiloutbound/CrudeOilOutboundMapper.xml  |  7 +++----
 .../crudeoiloutbound/CrudeOilOutboundService.java    | 12 ++----------
 .../biz/tankinformation/TankInformationMapper.java   | 11 ++++++++++-
 .../biz/tankinformation/TankInformationMapper.xml    |  5 ++++-
 19 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java
index 003513d1..feb32891 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java
@@ -20,5 +20,6 @@ public class CrudeOilInventoryRecord extends BaseEntity {
     private String tankSid;
     //记录时间
     private String recordDate;
+    private double height;
 
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java
index f941611f..5eba9db3 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java
@@ -20,4 +20,5 @@ public class CrudeOilInventoryRecordDetailsVo implements Vo {
     private String tankSid;
     //记录时间
     private String recordDate;
+    private double height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java
index 6221fcc9..1b36931f 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java
@@ -19,4 +19,5 @@ public class CrudeOilInventoryRecordDto implements Dto {
     private String tankSid;
     //记录时间
     private String recordDate;
+    private double height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java
index 968a68b8..23efffe3 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java
@@ -22,4 +22,5 @@ public class CrudeOilInventoryRecordQuery implements Query {
     private String recordDate;
     private String date;
     private String number;
+    private double height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java
index 01ecb8fa..12d00cc1 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java
@@ -21,4 +21,5 @@ public class CrudeOilInventoryRecordVo implements Vo {
     //记录时间
     private String recordDate;
     private String tankNumber;
+    private double height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java
index b2c881fe..fae581c6 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java
@@ -17,8 +17,8 @@ public class CrudeOilOutbound extends BaseEntity {
     private String salesContractNumber;
     //签订时间
     private String contractSigningDate;
-    //流量计sid
-    private String flowmeterSid;
+    //油罐sid
+    private String tankSid;
     //净重
     private double weight;
     //价值
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java
index 0f6b7fa4..649f2c27 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java
@@ -19,8 +19,8 @@ public class CrudeOilOutboundDetailsVo implements Vo {
     private String salesContractNumber;
     //签订时间
     private String contractSigningDate;
-    //流量计sid
-    private String flowmeterSid;
+    //油罐sid
+    private String tankSid;
     //净重
     private double weight;
     //价值
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java
index f3b915d9..a26560fb 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java
@@ -18,13 +18,12 @@ public class CrudeOilOutboundDto implements Dto {
     private String salesContractNumber;
     //签订时间
     private String contractSigningDate;
-    //流量计sid
-    private String flowmeterSid;
     //净重
     private double weight;
     //价值
-    private String value;
+    private double value;
     private String remarks;
     //出库时间
     private String deliveryDate;
+    private String tankSid;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
index 6309604a..fa665b68 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
@@ -19,8 +19,8 @@ public class CrudeOilOutboundQuery implements Query {
     private String contractNumber;
     //签订时间
     private String contractSigningDate;
-    //流量计sid
-    private String flowmeterSid;
+    //油罐sid
+    private String tankSid;
     //净重
     private double weight;
     //价值
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java
index 553ef59a..2f7d4626 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java
@@ -26,4 +26,12 @@ public class TankInformation extends BaseEntity {
     private double initialInventory=0;
     //油罐现有库存
     private double existingInventory=0;
+    //流量计sid
+    private String flowmeterSid;
+    //油的密度
+    private double density;
+    //底面积
+    private double bottomArea;
+    //高度
+    private double height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java
index 0acc4ac6..48848820 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java
@@ -26,4 +26,12 @@ public class TankInformationDetailsVo implements Vo {
     private double initialInventory;
     //油罐现有库存
     private double existingInventory;
+    //流量计sid
+    private String flowmeterSid;
+    //油的密度
+    private String density;
+    //底面积
+    private String bottomArea;
+    //高度
+    private String height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java
index a5a8bb1f..56ce0aed 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java
@@ -26,4 +26,12 @@ public class TankInformationDto implements Dto {
     private double initialInventory;
     //油罐现有库存
     private double existingInventory;
+    //流量计sid
+    private String flowmeterSid;
+    //油的密度
+    private String density;
+    //底面积
+    private String bottomArea;
+    //高度
+    private String height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java
index bfb1cddc..ff6fd42a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java
@@ -26,4 +26,12 @@ public class TankInformationQuery implements Query {
     private double initialInventory;
     //油罐现有库存
     private double existingInventory;
+    //流量计sid
+    private String flowmeterSid;
+    //油的密度
+    private String density;
+    //底面积
+    private String bottomArea;
+    //高度
+    private String height;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java
index 90b5c3d1..55c8ade8 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java
@@ -30,4 +30,14 @@ public class TankInformationVo implements Vo {
     private double initialInventory;
     //油罐现有库存
     private double existingInventory;
+    //流量计sid
+    private String flowmeterSid;
+    //油的密度
+    private String density;
+    //底面积
+    private String bottomArea;
+    //高度
+    private String height;
+    private String flowmeterName;
+    private String flowmeterNumber;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
index dbdb0e52..3d6f069a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
@@ -49,11 +49,12 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService<CrudeOilI
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
         entity.setRecordDate(dfmt);
+        entity.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity());
         baseMapper.insert(entity);
         //油罐每日填写信息修改
-        TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
-        tank.setExistingInventory(dto.getExistingInventory());
+        tank.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity());
         tankInformationMapper.updateById(tank);
         return rb.success().setMsg("新增成功");
     }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
index 828a16de..86009459 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
@@ -5,13 +5,12 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.name as flowmeterName,
-        f.number as flowmeterNumber
+        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
-        left join flowmeter_information f on f.sid=c.flowmeterSid
-        left join  tank_information t on t.sid =f.tankSid
+        left join  tank_information t on t.sid =c.tankSid
         left join  crude_oil_type_information i on i.sid =t.crudeSid
+        left join flowmeter_information f on f.sid =t.flowmeterSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
index 2b471739..a9a9b0ef 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
@@ -41,7 +41,7 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
         CrudeOilOutboundQuery query = pq.getParams();
         QueryWrapper<CrudeOilOutbound> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getDate())) {
-            qw.eq("STR_TO_DATE(c.deliverDate,'%Y-%m-%d')", query.getDate());
+            qw.eq("STR_TO_DATE(c.deliveryDate,'%Y-%m-%d')", query.getDate());
         }
         if (StringUtils.isNotBlank(query.getContractNumber())) {
             qw.like("c.salesContractNumber", query.getContractNumber());
@@ -60,15 +60,7 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setDeliveryDate(dfmt);
         baseMapper.insert(entity);
-        FlowmeterInformationVo flowmeter=flowmeterInformationMapper.getFlowmeterBySid(dto.getFlowmeterSid());
-        TankInformation tank=tankInformationMapper.getTankBySid(flowmeter.getTankSid());
-        //第一次入库/出库的时候用初始库存减去要出入的数量 给总库存
-//        if(tank.getLockVersion().equals(0)){
-//            tank.setInventory(tank.getInitialInventory()-dto.getWeight());
-//            tank.setLockVersion(tank.getLockVersion()+1);
-//        }else{
-//            tank.setInventory(tank.getInventory()-dto.getWeight());
-//        }
+        TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
         tank.setInventory(tank.getInventory()-dto.getWeight());
         tankInformationMapper.updateById(tank);
         return rb.success().setMsg("新增成功");
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
index 4cd461e1..6c5a8598 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
@@ -19,7 +19,16 @@ import java.util.List;
 @Mapper
 public interface TankInformationMapper extends BaseMapper<TankInformation> {
     IPage<TankInformationVo> selectPageVo(IPage<TankInformation> page, @Param(Constants.WRAPPER) Wrapper<TankInformation> qw);
-    @Select("select t.*,c.name as crudeName,c.number as crudeNumber from tank_information t left join crude_oil_type_information c on c.sid=t.crudeSid ")
+    @Select("SELECT\n" +
+            "\tt.*,\n" +
+            "\tc.NAME AS crudeName,\n" +
+            "\tc.number AS crudeNumber,\n" +
+            "\tf.name as flowmeterName,\n" +
+            "\tf.number as flowmeterNumber\n" +
+            "FROM\n" +
+            "\ttank_information t\n" +
+            "\tLEFT JOIN crude_oil_type_information c ON c.sid = t.crudeSid\n" +
+            "\tleft join flowmeter_information f on f.sid =t.flowmeterSid ")
     List<TankInformationVo> tankList();
     @Select("select * from tank_information where sid=#{sid}")
     TankInformation getTankBySid(@Param("sid")String sid);
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
index b6674c0a..73cbcbfa 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
@@ -5,10 +5,13 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.tankinformation.TankInformationVo">
         SELECT
-        *,c.name as crudeName,c.number as crudeNumber
+        *,c.name as crudeName,c.number as crudeNumber,
+        f.name as flowName,
+        f.number as flowNumber
         FROM
         tank_information t
         left join crude_oil_type_information c on c.sid=t.crudeSid
+        left join flowmeter_information f on f.sid =t.flowmeterSid
         <where>
             ${ew.sqlSegment}
         </where>

From f0043f7fb4fefbfcef9f1d2c20ea98675e085a6e Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 11 May 2023 11:37:18 +0800
Subject: [PATCH 3/3] 1

---
 .../cyf/biz/tankinformation/TankInformationMapper.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
index 73cbcbfa..ec78f928 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
@@ -6,8 +6,8 @@
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.tankinformation.TankInformationVo">
         SELECT
         *,c.name as crudeName,c.number as crudeNumber,
-        f.name as flowName,
-        f.number as flowNumber
+        f.name as flowmeterName,
+        f.number as flowmeterNumber
         FROM
         tank_information t
         left join crude_oil_type_information c on c.sid=t.crudeSid