封仓杂志不回显

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

@@ -3,9 +3,11 @@ package com.chinaitop.depot.storage.controller;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample.Criteria;
+import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 import com.chinaitop.depot.storage.model.vo.StorageQualitycheckVo;
 import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
+import com.chinaitop.depot.storage.service.StorageQualitycheckInspectionService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -41,6 +43,8 @@ public class StorageFoodbasicInfoController {
     @Resource
     private StorageQualitycheckSonService qualitycheckSonService;
 
+    @Resource
+    private StorageQualitycheckInspectionService qualitycheckInspectionService;
     /**
      * 得到当前仓的粮情专卡
      * @return
@@ -149,6 +153,7 @@ public class StorageFoodbasicInfoController {
                 foodbasicinfo = list.get(0);
 
                 List<StorageQualitycheckSon> SqsList =  qualitycheckSonService.getQualitycheckSonByFoodbasicinfoCheck(list.get(0).getId());
+                List<StorageQualitycheckInspection> SqciList =  qualitycheckInspectionService.getQualitycheckInByFoodbasicinfoCheck(list.get(0).getId());
                 for(StorageQualitycheckSon sqk : SqsList){
                     if(sqk.getNumbering()== 6996 ){
                         foodbasicinfo.setFatIndex(sqk.getSetValue());
@@ -159,6 +164,13 @@ public class StorageFoodbasicInfoController {
                         continue;
                     }
                 }
+                for(StorageQualitycheckInspection sqki : SqciList){
+                    if(sqki.getInsolubleImpurity()!=null ){
+                        foodbasicinfo.setImpurity(sqki.getInsolubleImpurity());
+                        continue;
+                    }
+
+                }
             }
             return foodbasicinfo;
         }else {

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

@@ -990,6 +990,8 @@
     sf.keep_method,
     sf.disperse_capacity,
     sf.height,
+    sf.length,
+    sf.weight,
     sf.pack_num,
     sf.pack_average_weight,
     sf.keeper_ids,

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckInspectionMapper.java

@@ -29,4 +29,6 @@ public interface StorageQualitycheckInspectionMapper {
     int updateByPrimaryKeySelective(StorageQualitycheckInspection record);
 
     int updateByPrimaryKey(StorageQualitycheckInspection record);
+
+    List<StorageQualitycheckInspection> getQualitycheckInByFoodbasicinfoCheck(Integer foodbasicinfoId);
 }

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

@@ -95,6 +95,18 @@
     from storage_qualitycheck_inspection
     where qualitycheck_id = #{id,jdbcType=INTEGER}
   </select>
+
+  <select id="getQualitycheckInByFoodbasicinfoCheck" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM storage_qualitycheck_inspection sqk
+    WHERE sqk.qualitycheck_id in (
+    SELECT qualitycheck_id
+    FROM storage_foodbasicinfochecks fcs
+    WHERE fcs.foodbasicinfo_id =#{id}
+    )
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from storage_qualitycheck_inspection
     where id = #{id,jdbcType=INTEGER}

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckInspectionService.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.storage.service;
 
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
 
+import java.util.List;
+
 /**
  *jidongjie
  * 2020.3.5
@@ -11,4 +13,6 @@ public interface StorageQualitycheckInspectionService {
     void save(StorageQualitycheckInspection qualityInspection);
 
     StorageQualitycheckInspection loadDataById(Integer id);
+
+    List<StorageQualitycheckInspection> getQualitycheckInByFoodbasicinfoCheck(Integer id);
 }

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

@@ -2,10 +2,12 @@ package com.chinaitop.depot.storage.service.impl;
 
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckInspectionMapper;
 import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 import com.chinaitop.depot.storage.service.StorageQualitycheckInspectionService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author jidongjie
@@ -26,7 +28,10 @@ public class StorageQualitycheckInspectionServiceImpl implements StorageQualityc
             qualitycheckInspectionMapper.updateByPrimaryKeySelective(qualityInspection);//修改数据
         }
     }
-
+    @Override
+    public List<StorageQualitycheckInspection> getQualitycheckInByFoodbasicinfoCheck(Integer foodbasicinfoId) {
+        return qualitycheckInspectionMapper.getQualitycheckInByFoodbasicinfoCheck(foodbasicinfoId);
+    }
     @Override
     public StorageQualitycheckInspection loadDataById(Integer id) {
         return qualitycheckInspectionMapper.selectByPrimaryKey(id);