原油修改

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;
 
 }

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;
 }

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;
 }

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;
 }

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;
 }

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

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;
 }

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

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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.getHeight()*tank.getBottomArea()*tank.getDensity());
-        tank.setExistingInventory(dto.getExistingInventory());
         tankInformationMapper.updateById(tank);
         return rb.success().setMsg("新增成功");
     }

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,
+        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
-        f.number as flowmeterNumber
         FROM
         crude_oil_outbound c
-        left join flowmeter_information f on f.sid=c.flowmeterSid
+        left join  tank_information t on t.sid =c.tankSid
-        left join  tank_information t on t.sid =f.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>

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(dto.getTankSid());
-        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());
-//        }
         tank.setInventory(tank.getInventory()-dto.getWeight());
         tankInformationMapper.updateById(tank);
         return rb.success().setMsg("新增成功");

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);

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>