原油修改，原油出入库附件上传

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

@@ -2,6 +2,7 @@ package com.yxt.supervise.cyf.api.crudeoiloutbound;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -26,4 +27,6 @@ public class CrudeOilOutboundDto implements Dto {
     //出库时间
     private String deliveryDate;
     private String tankSid;
+    @ApiModelProperty("原油出库附件")
+    private String[] crudeOilOutboundFiles;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java

@@ -2,6 +2,7 @@ package com.yxt.supervise.cyf.api.crudeoilstorage;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -32,4 +33,6 @@ public class CrudeOilStorageDto implements Dto {
     private String remarks;
     //入库日期
     private String warehousingDate;
+    @ApiModelProperty("原油入库附件")
+    private String[] crudeOilStorageFile;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java

@@ -23,4 +23,6 @@ public class MaterialInventory extends BaseEntity {
     private double initialInventory=0;
     //物料类型
     private String typeSid;
+    //1 原料  2 包装物
+    private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java

@@ -21,4 +21,6 @@ public class MaterialInventoryRecord extends BaseEntity {
     private String typeSid;
     //价值
     private String value;
+    //1 原料  2 包装物
+    private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutbound.java

@@ -25,4 +25,6 @@ public class MaterialOutbound extends BaseEntity {
     private double weight;
     //价值
     private String value;
+    //1 原料  2 包装物
+    private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java

@@ -29,5 +29,7 @@ public class MaterialStorage extends BaseEntity {
     private String value;
     //入库日期
     private String warehousingDate;
+    //1 原料  2 包装物
+    private String type;
 
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialType.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "物料类型信息", description = "物料类型信息")
-@TableName("raw_material_type")
+@TableName("material_type")
 public class MaterialType extends BaseEntity {
     //物料编号
     private String number;
@@ -19,5 +19,6 @@ public class MaterialType extends BaseEntity {
     private String name;
     //物料code
     private String code;
+    private String type;
 
 }

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

@@ -10,6 +10,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author wangpengfei
  * @date 2023/5/4 14:37
@@ -19,4 +22,5 @@ public interface CrudeOilOutboundMapper extends BaseMapper<CrudeOilOutbound> {
     IPage<CrudeOilOutboundVo> selectPageVo(IPage<CrudeOilOutbound> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilOutbound> qw);
     @Select("select * from crude_oil_outbound where sid=#{sid}")
     CrudeOilOutbound getCrudeBySid(@Param("sid")String sid);
+    void insertCrudeOilFiles(List<Map<String, String>> maps);
 }

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

@@ -15,5 +15,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <insert id="insertCrudeOilFiles">
+        insert into  crude_oil_outbound_file (sid, url, mainSid) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sid,jdbcType=VARCHAR},
+            #{item.url,jdbcType=VARCHAR},
+            #{item.mainSid,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
 
 </mapper>

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

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.*;
 
 /**
  * @author wangpengfei
@@ -59,6 +59,20 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setDeliveryDate(dfmt);
+        String [] file=dto.getCrudeOilOutboundFiles();
+        if(file!=null){
+            List<Map<String,String>> maps=new ArrayList<>();
+            for(String s:file){
+                Map<String,String>m=new HashMap<>();
+                m.put("mainSid",entity.getSid());
+                m.put("url",s);
+                m.put("sid", UUID.randomUUID().toString());
+                maps.add(m);
+            }
+            if(maps.size()>0){
+                baseMapper.insertCrudeOilFiles(maps);
+            }
+        }
         baseMapper.insert(entity);
         TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
         tank.setInventory(tank.getInventory()-dto.getWeight());

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

@@ -10,6 +10,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author wangpengfei
  * @date 2023/5/4 14:37
@@ -19,4 +22,5 @@ public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
     IPage<CrudeOilStorageVo> selectPageVo(IPage<CrudeOilStorage> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilStorage> qw);
     @Select("select * from crude_oil_type_information where sid=#{sid}")
     CrudeOilStorage getCrudeBySid(@Param("sid")String sid);
+    void insertCrudeOilFiles(List<Map<String, String>> maps);
 }

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

@@ -14,5 +14,14 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
+    <insert id="insertCrudeOilFiles">
+        insert into  crude_oil_storage_file (sid, url, mainSid) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sid,jdbcType=VARCHAR},
+            #{item.url,jdbcType=VARCHAR},
+            #{item.mainSid,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
 </mapper>

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

@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+
 /**
  * @author wangpengfei
  * @date 2023/5/4 14:37
@@ -44,9 +46,24 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
     }
     @Transactional
     public ResultBean save(CrudeOilStorageDto dto){
+
         ResultBean rb=new ResultBean();
         CrudeOilStorage entity=new CrudeOilStorage();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        String [] file=dto.getCrudeOilStorageFile();
+        if(file!=null){
+            List<Map<String,String>> maps=new ArrayList<>();
+            for(String s:file){
+                Map<String,String>m=new HashMap<>();
+                m.put("mainSid",entity.getSid());
+                m.put("url",s);
+                m.put("sid", UUID.randomUUID().toString());
+                maps.add(m);
+            }
+            if(maps.size()>0){
+                baseMapper.insertCrudeOilFiles(maps);
+            }
+        }
         baseMapper.insert(entity);
         //油罐库存增加
         TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.java

@@ -19,8 +19,8 @@ import java.util.List;
 @Mapper
 public interface MaterialTypeMapper extends BaseMapper<MaterialType> {
     IPage<MaterialTypeVo> selectPageVo(IPage<MaterialType> page, @Param(Constants.WRAPPER) Wrapper<MaterialType> qw);
-    @Select("select * from material_type")
-    List<MaterialTypeVo> typeList();
+    @Select("select * from material_type where type=#{type}")
+    List<MaterialTypeVo> typeList(@Param("type") String type);
     @Select("select * from material_type where sid=#{sid}")
     MaterialType getTypeBySid(@Param("sid")String sid);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeRest.java

@@ -31,11 +31,11 @@ public class MaterialTypeRest {
         PagerVo<MaterialTypeVo> pv = RawMaterialTypeService.listPageVo(pq);
         return rb.success().setData(pv);
     }
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据物料类型查询数据的列表")
     @PostMapping("/typeList")
-    public ResultBean<PagerVo<MaterialTypeVo>> typeList() {
+    public ResultBean<PagerVo<MaterialTypeVo>> typeList(String type) {
         ResultBean rb = ResultBean.fireFail();
-        List<MaterialTypeVo> pv = RawMaterialTypeService.typeList();
+        List<MaterialTypeVo> pv = RawMaterialTypeService.typeList(type);
         return rb.success().setData(pv);
     }
     @ApiOperation("新增")

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java

@@ -39,8 +39,8 @@ public class MaterialTypeService extends MybatisBaseService<MaterialTypeMapper,
         PagerVo<MaterialTypeVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<MaterialTypeVo> typeList() {
-        return baseMapper.typeList();
+    public List<MaterialTypeVo> typeList(String type) {
+        return baseMapper.typeList(type);
     }
     public ResultBean save(MaterialTypeDto dto){
         ResultBean rb=new ResultBean();

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

@@ -32,4 +32,7 @@ public interface TankInformationMapper extends BaseMapper<TankInformation> {
     List<TankInformationVo> tankList();
     @Select("select * from tank_information where sid=#{sid}")
     TankInformation getTankBySid(@Param("sid")String sid);
+
+    @Select("select *,f.name as flowmeterName,f.number as flowmeterNumber from tank_information t left join flowmeter_information f on f.sid=t.flowmeterSid where crudeSid=#{crudeSid} ")
+    List<TankInformationVo> listByType(@Param("crudeSid") String crudeSid);
 }

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

@@ -58,4 +58,11 @@ public class TankInformationRest {
     public ResultBean delete(@PathVariable String sid ){
         return tankInformationService.del(sid);
     }
+    @ApiOperation("根据原油种类查询数据的列表")
+    @GetMapping("/listByType/{crudeSid}")
+    public ResultBean<PagerVo<TankInformationVo>> listByType(@PathVariable String crudeSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<TankInformationVo> pv = tankInformationService.listByType(crudeSid);
+        return rb.success().setData(pv);
+    }
 }

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

@@ -39,6 +39,9 @@ public class TankInformationService extends MybatisBaseService<TankInformationMa
     public List<TankInformationVo> tankList() {
         return baseMapper.tankList();
     }
+    public List<TankInformationVo> listByType(String crudeSid) {
+        return baseMapper.listByType(crudeSid);
+    }
     public ResultBean save(TankInformationDto dto){
         ResultBean rb=new ResultBean();
         TankInformation entity=new TankInformation();