sql脚本修改 接口修改

yxt-supervise-cyf/docs/databases/create_table.sql

@@ -13,19 +13,19 @@ CREATE TABLE `tank_information`  (
 `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
 `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
 `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
- `number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐编号',
+`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐编号',
 `capacity` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐容量',
-`tankPipeline` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐管道',
 `crudeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐所属原油类型',
 `inventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐库存',
-`initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐初始库存',
-`existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐当天现有库存（当天填写）',
+  `initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐初始库存',
+  `existingInventory` double(100, 0) NULL DEFAULT NULL COMMENT '油罐当天现有库存（当天填写）',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '油罐信息' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '油罐信息' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
 
+
 DROP TABLE IF EXISTS `crude_oil_type_information`;
 CREATE TABLE `crude_oil_type_information`  (
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -43,10 +43,11 @@ CREATE TABLE `crude_oil_type_information`  (
 `number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原油编号',
 `code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原油code',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油类型' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油类型' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+
 DROP TABLE IF EXISTS `crude_oil_storage`;
 CREATE TABLE `crude_oil_storage`  (
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -67,12 +68,14 @@ CREATE TABLE `crude_oil_storage`  (
 `tankSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid',
 `weight` double(255, 0) NULL DEFAULT NULL COMMENT '收料净重',
 `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '收料价值',
+`warehousingDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库日期',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油入库' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油入库' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
 
+
 DROP TABLE IF EXISTS `crude_oil_outbound`;
 CREATE TABLE `crude_oil_outbound`  (
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -88,14 +91,16 @@ CREATE TABLE `crude_oil_outbound`  (
 `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
 `salesContractNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '销售合同号',
 `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签订日期',
-`tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid',
+`flowmeterSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid',
 `weight` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '净重',
 `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价值',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油出库记录' ROW_FORMAT = Dynamic;
+`deliveryDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库时间',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油出库记录' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+
 DROP TABLE IF EXISTS `crude_oil_inventory_record`;
 CREATE TABLE `crude_oil_inventory_record`  (
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -117,3 +122,28 @@ CREATE TABLE `crude_oil_inventory_record`  (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+
+DROP TABLE IF EXISTS `flowmeter_information`;
+CREATE TABLE `flowmeter_information`  (
+`id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
+`sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+`lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+`createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+`modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+`isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
+`state` int(0) NULL DEFAULT 1 COMMENT '状态',
+`isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
+`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+`createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
+`updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
+`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流量计名称',
+`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流量计编号',
+`code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '流量计code',
+`tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid',
+PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '流量计信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java

@@ -20,4 +20,5 @@ public class CrudeOilInventoryRecordVo implements Vo {
     private String tankSid;
     //记录时间
     private String recordDate;
+    private String tankNumber;
 }

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 tankSid;
+    //流量计sid
+    private String flowmeterSid;
     //净重
     private double weight;
     //价值

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 tankSid;
+    //流量计sid
+    private String flowmeterSid;
     //净重
     private double weight;
     //价值

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java

@@ -18,8 +18,8 @@ public class CrudeOilOutboundDto implements Dto {
     private String salesContractNumber;
     //签订时间
     private String contractSigningDate;
-    //油罐sid
-    private String tankSid;
+    //流量计sid
+    private String flowmeterSid;
     //净重
     private double weight;
     //价值

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 salesContractNumber;
     //签订时间
     private String contractSigningDate;
-    //油罐sid
-    private String tankSid;
+    //流量计sid
+    private String flowmeterSid;
     //净重
     private double weight;
     //价值

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java

@@ -32,4 +32,6 @@ public class CrudeOilOutboundVo implements Vo {
     private String crudeNumber;
     private String crudeName;
     private double inventory=0;
+    private String flowmeterSid;
+    private String flowmeterName;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformation.java

@@ -0,0 +1,24 @@
+package com.yxt.supervise.cyf.api.flowmeterinformation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:26
+ */
+@Data
+@ApiModel(value = "流量计信息", description = "流量计信息")
+@TableName("flowmeter_information")
+public class FlowmeterInformation extends BaseEntity {
+    //原油名称
+    private String name;
+    //原油编号
+    private String number;
+    //原油code
+    private String code;
+    private String tankSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDetailsVo.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.cyf.api.flowmeterinformation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:29
+ */
+@Data
+@ApiModel(value = "流量计信息 视图数据对象", description = "流量计信息 视图数据对象")
+public class FlowmeterInformationDetailsVo implements Vo {
+    private String id;
+    private String sid;
+    //流量计名称
+    private String name;
+    //流量计编号
+    private String number;
+    //流量计code
+    private String code;
+    private String tankSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationDto.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.cyf.api.flowmeterinformation;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:28
+ */
+@Data
+@ApiModel(value = "流量计信息 数据传输对象", description = "流量计信息 数据传输对象")
+public class FlowmeterInformationDto implements Dto {
+    private String id;
+    private String sid;
+    //流量计名称
+    private String name;
+    //流量计编号
+    private String number;
+    //流量计code
+    private String code;
+    private String tankSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.cyf.api.flowmeterinformation;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:29
+ */
+@Data
+@ApiModel(value = "流量计信息 查询条件", description = "流量计信息 查询条件")
+public class FlowmeterInformationQuery implements Query {
+    private String id;
+    private String sid;
+    //流量计名称
+    private String name;
+    //流量计编号
+    private String number;
+    //流量计code
+    private String code;
+    private String tankSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/flowmeterinformation/FlowmeterInformationVo.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.cyf.api.flowmeterinformation;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:28
+ */
+@Data
+@ApiModel(value = "流量计信息 视图数据详情", description = "流量计信息 视图数据详情")
+public class FlowmeterInformationVo implements Vo {
+    private String id;
+    private String sid;
+
+    //流量计名称
+    private String name;
+    //流量计编号
+    private String number;
+    //流量计code
+    private String code;
+    //油罐sid
+    private String tankSid;
+    private String tankNumber;
+    private String crudeName;
+    private String crudeNumber;
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java

@@ -20,8 +20,6 @@ public class TankInformation extends BaseEntity {
     private String capacity;
     //原油类型
     private String crudeSid;
-    //油罐管道
-    private String tankPipeline;
     //油罐库存
     private double inventory=0;
     //油罐初始库存

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java

@@ -20,8 +20,6 @@ public class TankInformationDetailsVo implements Vo {
     private String capacity;
     //原油类型
     private String crudeSid;
-    //油罐管道
-    private String tankPipeline;
     //油罐库存
     private double inventory;
     //油罐初始库存

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java

@@ -20,8 +20,6 @@ public class TankInformationDto implements Dto {
     private String capacity;
     //原油类型
     private String crudeSid;
-    //油罐管道
-    private String tankPipeline;
     //油罐库存
     private double inventory;
     //油罐初始库存

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java

@@ -20,8 +20,6 @@ public class TankInformationQuery implements Query {
     private String capacity;
     //原油类型
     private String crudeSid;
-    //油罐管道
-    private String tankPipeline;
     //油罐库存
     private double inventory;
     //油罐初始库存

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java

@@ -24,8 +24,6 @@ public class TankInformationVo implements Vo {
     private String crudeName;
     //原油类型编号
     private String crudeNumber;
-    //油罐管道
-    private String tankPipeline;
     //油罐库存
     private double inventory;
     //油罐初始库存

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java

@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface CrudeOilInventoryRecordMapper extends BaseMapper<CrudeOilInventoryRecord> {
     IPage<CrudeOilInventoryRecordVo> selectPageVo(IPage<CrudeOilInventoryRecord> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilInventoryRecord> qw);
-    @Select("select * from crude_oil_inventory_record where sid=#{sid}")
+    @Select("select *,t.number as tankNumber from crude_oil_inventory_record  left join  tank_information t on t.sid =c.tankSid where sid=#{sid}")
     CrudeOilInventoryRecord getCrudeBySid(@Param("sid")String sid);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java

@@ -20,31 +20,9 @@ public class CrudeOilInventoryRecordRest {
     @Autowired
     CrudeOilInventoryRecordService CrudeOilInventoryRecordService;
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    public ResultBean<PagerVo<CrudeOilInventoryRecordVo>> listPage(@RequestBody PagerQuery<CrudeOilInventoryRecordQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
-        PagerVo<CrudeOilInventoryRecordVo> pv = CrudeOilInventoryRecordService.listPageVo(pq);
-        return rb.success().setData(pv);
-    }
     @ApiOperation("新增")
     @PostMapping("/save")
     public ResultBean save (@RequestBody CrudeOilInventoryRecordDto dto){
         return CrudeOilInventoryRecordService.save(dto);
     }
-    @ApiOperation("修改")
-    @PostMapping("/update")
-    public ResultBean update (@RequestBody CrudeOilInventoryRecordDto dto){
-        return CrudeOilInventoryRecordService.update(dto);
-    }
-    @ApiOperation("根据sid查询")
-    @GetMapping("/getCrudeBySid/{sid}")
-    public ResultBean getTankBySid(@PathVariable String sid){
-        return CrudeOilInventoryRecordService.getCrudeBySid(sid);
-    }
-    @ApiOperation("删除")
-    @DeleteMapping("/delete/{sid}")
-    public ResultBean delete(@PathVariable String sid ){
-        return CrudeOilInventoryRecordService.del(sid);
-    }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java

@@ -1,6 +1,7 @@
 package com.yxt.supervise.cyf.biz.crudeoilinventoryrecord;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -14,6 +15,8 @@ import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author wangpengfei
  * @date 2023/5/4 14:37
@@ -35,6 +38,9 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService<CrudeOilI
         ResultBean rb=new ResultBean();
         CrudeOilInventoryRecord entity=new CrudeOilInventoryRecord();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        Date curDate = new Date();
+        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        entity.setRecordDate(dfmt);
         baseMapper.insert(entity);
         //油罐每日填写信息修改
         TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml

@@ -5,10 +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
+        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.name as flowmeterName ,
+        f.number as fleowmeterNumber
         FROM
         crude_oil_outbound c
-        left join  tank_information t on t.sid =c.tankSid
+        left join flowmeter_information f on f.sid=c.flowmeterSid
+        left join  tank_information t on t.sid =f.tankSid
         left join  crude_oil_type_information i on i.sid =t.crudeSid
         <where>
             ${ew.sqlSegment}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundRest.java

@@ -34,19 +34,10 @@ public class CrudeOilOutboundRest {
     public ResultBean save (@RequestBody CrudeOilOutboundDto dto){
         return CrudeOilOutboundService.save(dto);
     }
-    @ApiOperation("修改")
-    @PostMapping("/update")
-    public ResultBean update (@RequestBody CrudeOilOutboundDto dto){
-        return CrudeOilOutboundService.update(dto);
-    }
     @ApiOperation("根据sid查询")
     @GetMapping("/getCrudeBySid/{sid}")
     public ResultBean getTankBySid(@PathVariable String sid){
         return CrudeOilOutboundService.getCrudeBySid(sid);
     }
-    @ApiOperation("删除")
-    @DeleteMapping("/delete/{sid}")
-    public ResultBean delete(@PathVariable String sid ){
-        return CrudeOilOutboundService.del(sid);
-    }
+
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java

@@ -13,7 +13,10 @@ import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutbound;
 import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundDto;
 import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundQuery;
 import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformation;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo;
 import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
+import com.yxt.supervise.cyf.biz.flowmeterinformation.FlowmeterInformationMapper;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +32,8 @@ import java.util.Date;
 public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutboundMapper, CrudeOilOutbound> {
     @Autowired
     TankInformationMapper tankInformationMapper;
+    @Autowired
+    FlowmeterInformationMapper flowmeterInformationMapper;
 
     public PagerVo<CrudeOilOutboundVo> listPageVo(PagerQuery<CrudeOilOutboundQuery> pq) {
         CrudeOilOutboundQuery query = pq.getParams();
@@ -46,7 +51,8 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setDeliveryDate(dfmt);
         baseMapper.insert(entity);
-        TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
+        FlowmeterInformationVo flowmeter=flowmeterInformationMapper.getFlowmeterBySid(dto.getFlowmeterSid());
+        TankInformation tank=tankInformationMapper.getTankBySid(flowmeter.getTankSid());
         //第一次入库/出库的时候用初始库存减去要出入的数量 给总库存
 //        if(tank.getLockVersion().equals(0)){
 //            tank.setInventory(tank.getInitialInventory()-dto.getWeight());

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageRest.java

@@ -34,19 +34,11 @@ public class CrudeOilStorageRest {
     public ResultBean save (@RequestBody CrudeOilStorageDto dto){
         return CrudeOilStorageService.save(dto);
     }
-    @ApiOperation("修改")
-    @PostMapping("/update")
-    public ResultBean update (@RequestBody CrudeOilStorageDto dto){
-        return CrudeOilStorageService.update(dto);
-    }
+
     @ApiOperation("根据sid查询")
     @GetMapping("/getCrudeBySid/{sid}")
     public ResultBean getCrudeBySid(@PathVariable String sid){
         return CrudeOilStorageService.getCrudeBySid(sid);
     }
-    @ApiOperation("删除")
-    @DeleteMapping("/delete/{sid}")
-    public ResultBean delete(@PathVariable String sid ){
-        return CrudeOilStorageService.del(sid);
-    }
+
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationMapper.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.cyf.biz.flowmeterinformation;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformation;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Mapper
+public interface FlowmeterInformationMapper extends BaseMapper<FlowmeterInformation> {
+    IPage<FlowmeterInformationVo> selectPageVo(IPage<FlowmeterInformation> page, @Param(Constants.WRAPPER) Wrapper<FlowmeterInformation> qw);
+    @Select("        SELECT" +
+            "        *,t.number as tankNumber,c.name as crdueName,c.number as crudeNumber" +
+            "        FROM" +
+            "        flowmeter_information f" +
+            "        left join tank_information t on t.sid=f.tankSid" +
+            "        left join crude_oil_type_information c on c.sid=t.crudeSid ")
+    List<FlowmeterInformationVo> flowmeterList();
+    @Select("select f.*,t.number as tankNumber from flowmeter_information f left join tank_information t on t.sid=f.tankSid where f.sid=#{sid}")
+    FlowmeterInformationVo getFlowmeterBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.cyf.biz.flowmeterinformation.FlowmeterInformationMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo">
+        SELECT
+        f.*,t.number as tankNumber,c.name as crudeName,c.number as crudeNumber--
+        FROM
+        flowmeter_information f
+        left join tank_information t on t.sid=f.tankSid
+        left join crude_oil_type_information c on c.sid=t.crudeSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationRest.java

@@ -0,0 +1,61 @@
+package com.yxt.supervise.cyf.biz.flowmeterinformation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationDto;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationQuery;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:38
+ */
+@Api(tags = "流量计信息")
+@RestController
+@RequestMapping("cyf/flowmeter")
+public class FlowmeterInformationRest {
+    @Autowired
+    FlowmeterInformationService FlowmeterInformationService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<FlowmeterInformationVo>> listPage(@RequestBody PagerQuery<FlowmeterInformationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FlowmeterInformationVo> pv = FlowmeterInformationService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/flowmeterList")
+    public ResultBean<PagerVo<FlowmeterInformationVo>> flowmeterList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<FlowmeterInformationVo> pv = FlowmeterInformationService.flowmeterList();
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save (@RequestBody FlowmeterInformationDto dto){
+        return FlowmeterInformationService.save(dto);
+    }
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update (@RequestBody FlowmeterInformationDto dto){
+        return FlowmeterInformationService.update(dto);
+    }
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getTankBySid/{sid}")
+    public ResultBean getTankBySid(@PathVariable String sid){
+        return FlowmeterInformationService.getTankBySid(sid);
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid ){
+        return FlowmeterInformationService.del(sid);
+    }
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java

@@ -0,0 +1,62 @@
+package com.yxt.supervise.cyf.biz.flowmeterinformation;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformation;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationDto;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationQuery;
+import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Service
+public class FlowmeterInformationService extends MybatisBaseService<FlowmeterInformationMapper, FlowmeterInformation> {
+
+
+    public PagerVo<FlowmeterInformationVo> listPageVo(PagerQuery<FlowmeterInformationQuery> pq) {
+        FlowmeterInformationQuery query = pq.getParams();
+        QueryWrapper<FlowmeterInformation> qw = new QueryWrapper<>();
+        IPage<FlowmeterInformation> page = PagerUtil.queryToPage(pq);
+        IPage<FlowmeterInformationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<FlowmeterInformationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<FlowmeterInformationVo> flowmeterList() {
+        return baseMapper.flowmeterList();
+    }
+    public ResultBean save(FlowmeterInformationDto dto){
+        ResultBean rb=new ResultBean();
+        FlowmeterInformation entity=new FlowmeterInformation();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("新增成功");
+    }
+    public ResultBean update (FlowmeterInformationDto dto){
+        ResultBean rb=new ResultBean();
+        FlowmeterInformation entity=fetchBySid(dto.getSid());
+        BeanUtil.copyProperties(dto, entity, "id","sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改成功");
+    }
+    public ResultBean getTankBySid(String sid){
+        ResultBean rb=new ResultBean();
+        FlowmeterInformationVo FlowmeterInformation=baseMapper.getFlowmeterBySid(sid);
+        return  rb.success().setData(FlowmeterInformation);
+    }
+    public ResultBean del(String sid){
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<FlowmeterInformation>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java

@@ -40,8 +40,8 @@ public class TankInformationService extends MybatisBaseService<TankInformationMa
     public ResultBean save(TankInformationDto dto){
         ResultBean rb=new ResultBean();
         TankInformation entity=new TankInformation();
-        entity.setInventory(entity.getInitialInventory());
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setInventory(dto.getInitialInventory());
         baseMapper.insert(entity);
         return rb.success().setMsg("新增成功");
     }