质检油罐初检后封仓

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -296,7 +296,8 @@ public class StorageQualitycheckController {
         if(StringUtils.isNoneBlank(warehouseId)){
             qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
         }
-        qualityCheck.setType("1");///查找验收质量管理的信息
+//        qualityCheck.setType("1");///查找验收质量管理的信息
+        qualityCheck.setType("0");///查找初检质量管理的信息
 
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
 

src/main/java/com/chinaitop/depot/storage/mapper/StorageFoodbasicinfoMapper.xml

@@ -998,7 +998,8 @@
     sf.place_of_origin,
     <!--  #tbt.storehouse_id,-->
     bt.storageTank_name storehouseName,
-
+    bt.tank_type storehouseType,
+    bt.tank_capacity designCapacity,
     temp_sqk.keeper keeperNames,
     temp_sqk.water,
     temp_sqk.impurity,
@@ -1011,11 +1012,16 @@
     temp_sqk.fat_index,
     temp_sqk.quality,
     temp_sqk.sub_type,
-    temp_fcbgz.mxpz sub_type_detailed,
+    temp_sqk.location,
+    temp_sqk.sub_type_detailed,
+    temp_sqk.number,
+    temp_sqk.number * 0.001 stand_number,
+    temp_sqk.harvest_time harvestTime
+    <!--temp_fcbgz.mxpz sub_type_detailed,
     temp_fcbgz.kcsl number,
     temp_fcbgz.kcsl * 0.001  stand_number,
     temp_fcbgz.hwcd,
-    temp_fcbgz.scnf
+    temp_fcbgz.scnf-->
     FROM
     storage_foodbasicinfo sf
     LEFT JOIN (
@@ -1027,14 +1033,14 @@
     <if test="houseId != null">
       AND sqk.tank_id = #{houseId}
     </if>
-    AND sqk.type = 1
+    AND sqk.type = 0
     AND sqk.history_status = 0
     ORDER BY
     id DESC
     LIMIT 1
     ) temp_sqk ON sf.house_id = temp_sqk.house_id
     LEFT JOIN basic_tank bt ON bt.id = sf.house_id
-    LEFT JOIN (
+    <!--LEFT JOIN (
     SELECT
     *
     FROM
@@ -1046,7 +1052,7 @@
     ORDER BY
     rq DESC
     LIMIT 1
-    ) temp_fcbgz ON sf.house_id = temp_fcbgz.ch
+    ) temp_fcbgz ON sf.house_id = temp_fcbgz.ch-->
     WHERE 1=1
     <if test="houseId != null">
       AND sf.house_id = #{houseId}

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1911,6 +1911,8 @@
     bs.storeHouse_name storehouseName,
     bw.warehouse_name wareHouseName,
     bb.storageTank_name tankName,
+    bb.tank_type storehouseType,
+    bb.tank_capacity designCapacity,
     sf.foodbasicinfo_id foodbasicinfoId
     FROM storage_qualitycheck sqk
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = sqk.house_id

src/main/java/com/chinaitop/depot/storage/model/StorageFoodbasicinfo.java

@@ -9,6 +9,28 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class StorageFoodbasicinfo {
+
+    private Integer storehouseType;//仓型
+    private Integer harvestTime;
+
+    public Integer getStorehouseType() {
+        return storehouseType;
+    }
+
+    public void setStorehouseType(Integer storehouseType) {
+        this.storehouseType = storehouseType;
+    }
+
+    public BigDecimal getDesignCapacity() {
+        return designCapacity;
+    }
+
+    public void setDesignCapacity(BigDecimal designCapacity) {
+        this.designCapacity = designCapacity;
+    }
+
+
+    private BigDecimal designCapacity;//仓容
     private Integer id;
 
     private  String houseId;
@@ -20,6 +42,15 @@ public class StorageFoodbasicinfo {
     private String keepUnite;
 
     private String locationNum;
+    private Integer location;
+
+    public Integer getLocation() {
+        return location;
+    }
+
+    public void setLocation(Integer location) {
+        this.location = location;
+    }
 
     private String quality;
 
@@ -37,6 +68,14 @@ public class StorageFoodbasicinfo {
 
     private Integer growYear;
 
+    public Integer getHarvestTime() {
+        return harvestTime;
+    }
+
+    public void setHarvestTime(Integer harvestTime) {
+        this.harvestTime = harvestTime;
+    }
+
     private String keepMethod;
 
     private String level;

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -5,6 +5,28 @@ import java.math.BigDecimal;
 
 
 public class StorageQualitycheck {
+
+
+    private Integer storehouseType;//仓型
+
+    public Integer getStorehouseType() {
+        return storehouseType;
+    }
+
+    public void setStorehouseType(Integer storehouseType) {
+        this.storehouseType = storehouseType;
+    }
+
+    public BigDecimal getDesignCapacity() {
+        return designCapacity;
+    }
+
+    public void setDesignCapacity(BigDecimal designCapacity) {
+        this.designCapacity = designCapacity;
+    }
+
+
+    private BigDecimal designCapacity;//仓容
     /*2021.01新增字段*/
     //0 初检，1验收
     private Integer flagType;

src/main/java/com/chinaitop/depot/storage/service/impl/StorageFoodbasicInfoServiceImpl.java

@@ -131,6 +131,7 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
         //⑤其他
         foodbasicInfo.setKeepUnite(qualitycheckVo.getDepotName());//所属库点名称
         foodbasicInfo.setSealStatus("1");//代表已经封仓
+        //foodbasicInfo.setKeepUnite(foodbasicInfo.getRecorder());//代表已经封仓
 
         //1.1状态已封仓
         qualitycheck.setSealStatus("1");