封仓和库存识别码编辑页面 要显示封仓日期. 粮堆长宽显示在封仓页

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

@@ -383,6 +383,8 @@ public class StorageQualitycheckController {
             List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitycheckData(qualityCheckExample);
             if (null != list && list.size() > 0) {
                 foodbasicinfo.setHeight(list.get(0).getHeight());
+                foodbasicinfo.setWidth(list.get(0).getWidth());
+                foodbasicinfo.setLength(list.get(0).getLength());
                 foodbasicinfo.setDisperseCapacity(list.get(0).getDisperseCapacity());
                 foodbasicinfo.setKeepMethod(list.get(0).getKeepMethod());
                 foodbasicinfo.setPrice(list.get(0).getPrice());

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

@@ -924,7 +924,8 @@
   temp_sqk.id sqkid,
   temp_sqk.full_good_ration fullGoodRation,
   temp_sqk.husked_ration huskedRation,
-  temp_sqk.location location
+  temp_sqk.location location,
+  temp_sqk.seal_date sealDate
       FROM
         storage_foodbasicinfo sf
       LEFT JOIN basic_warehouse bw ON bw.storehouse_id = sf.house_id

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

@@ -1984,6 +1984,8 @@
     bs.storeHouse_name storehouseName,
     bs.keeping_way keepMethod,
     bs.grain_heigth height,
+    bs.length length,
+    bs.width width,
     bs.bin_volume disperseCapacity,
     bs.depot_name depotName,
     bw.warehouse_name wareHouseName,

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

@@ -766,7 +766,26 @@ public class StorageQualitycheck {
 
     //封仓业务字段
     private String disperseCapacity;
+
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
     private BigDecimal height;
+    private BigDecimal width;
+    private BigDecimal length;
     private String keepMethod;
     private String price;
     private String depotName;

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

@@ -62,67 +62,67 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
     public List<StorageFoodbasicinfo> getByHouseIdAndWarehouseId(StorageFoodbasicinfo foodbasicInfo) {
         //设置保管员的名字
         List<StorageFoodbasicinfo> list = foodbasicInfoMapper.getFoodbasicInfoByHouseIdAndWarehouseId(foodbasicInfo);
-        if(list.size()>0){
-            int i = 0;
-            for(;i<list.size();i++){
-                list.get(i).setPlaceOfOrigin(list.get(i).getLocation());
-                List<StorageQualitycheckSon> QualitycheckdList =  qualitycheckSonService.selectByQualitycheckId(list.get(i).getSqkid());
-                for(StorageQualitycheckSon qc : QualitycheckdList){
-                    if(qc.getNumbering()== 2789 && ParameterUtil.isnull(list.get(i).getEatScore())){//品尝评分
-                        list.get(i).setEatScore(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering()== 2797 && ParameterUtil.isnull(list.get(i).getEatScore())){//品尝评分
-                        list.get(i).setEatScore(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2790 && ParameterUtil.isnull(list.get(i).getGlutenWaterCount())){//面筋吸水量(%)
-                        list.get(i).setGlutenWaterCount(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 6996 && ParameterUtil.isnull(list.get(i).getFatIndex())){//脂肪酸值
-                        list.get(i).setFatIndex(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2798 && ParameterUtil.isnull(list.get(i).getFatIndex())){//脂肪酸值
-                        list.get(i).setFatIndex(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2788 && ParameterUtil.isnull(list.get(i).getColorsmell())){//色泽气味
-                        list.get(i).setColorsmell(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2796 && ParameterUtil.isnull(list.get(i).getColorsmell())){//色泽气味
-                        list.get(i).setColorsmell(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2795 && ParameterUtil.isnull(list.get(i).getMildewCount())){//霉变粒
-                        list.get(i).setMildewCount(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2785 && ParameterUtil.isnull(list.get(i).getWeight())){//容重（出糙率%或纯粮率%）
-                        list.get(i).setWeight(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2793 && ParameterUtil.isnull(list.get(i).getWeight())){//容重（出糙率%或纯粮率%）
-                        list.get(i).setWeight(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 6995 && ParameterUtil.isnull(list.get(i).getPeroxideValue())){//过氧化值
-                        list.get(i).setPeroxideValue(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2801 && ParameterUtil.isnull(list.get(i).getCapacity())){//容重(出糙率%或纯粮率%)
-                        list.get(i).setCapacity(qc.getSetValue());
-                        continue;
-                    }
-                    if(qc.getNumbering() == 2802 && ParameterUtil.isnull(list.get(i).getBadpart())){//不完善粒(整精米率%)：
-                        list.get(i).setBadpart(qc.getSetValue());
-                        continue;
-                    }
-                }
-            }
-        }
+//        if(list.size()>0){
+//            int i = 0;
+//            for(;i<list.size();i++){
+//                list.get(i).setPlaceOfOrigin(list.get(i).getLocation());
+//                List<StorageQualitycheckSon> QualitycheckdList =  qualitycheckSonService.selectByQualitycheckId(list.get(i).getSqkid());
+//                for(StorageQualitycheckSon qc : QualitycheckdList){
+//                    if(qc.getNumbering()== 2789 && ParameterUtil.isnull(list.get(i).getEatScore())){//品尝评分
+//                        list.get(i).setEatScore(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering()== 2797 && ParameterUtil.isnull(list.get(i).getEatScore())){//品尝评分
+//                        list.get(i).setEatScore(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2790 && ParameterUtil.isnull(list.get(i).getGlutenWaterCount())){//面筋吸水量(%)
+//                        list.get(i).setGlutenWaterCount(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 6996 && ParameterUtil.isnull(list.get(i).getFatIndex())){//脂肪酸值
+//                        list.get(i).setFatIndex(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2798 && ParameterUtil.isnull(list.get(i).getFatIndex())){//脂肪酸值
+//                        list.get(i).setFatIndex(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2788 && ParameterUtil.isnull(list.get(i).getColorsmell())){//色泽气味
+//                        list.get(i).setColorsmell(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2796 && ParameterUtil.isnull(list.get(i).getColorsmell())){//色泽气味
+//                        list.get(i).setColorsmell(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2795 && ParameterUtil.isnull(list.get(i).getMildewCount())){//霉变粒
+//                        list.get(i).setMildewCount(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2785 && ParameterUtil.isnull(list.get(i).getWeight())){//容重（出糙率%或纯粮率%）
+//                        list.get(i).setWeight(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2793 && ParameterUtil.isnull(list.get(i).getWeight())){//容重（出糙率%或纯粮率%）
+//                        list.get(i).setWeight(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 6995 && ParameterUtil.isnull(list.get(i).getPeroxideValue())){//过氧化值
+//                        list.get(i).setPeroxideValue(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2801 && ParameterUtil.isnull(list.get(i).getCapacity())){//容重(出糙率%或纯粮率%)
+//                        list.get(i).setCapacity(qc.getSetValue());
+//                        continue;
+//                    }
+//                    if(qc.getNumbering() == 2802 && ParameterUtil.isnull(list.get(i).getBadpart())){//不完善粒(整精米率%)：
+//                        list.get(i).setBadpart(qc.getSetValue());
+//                        continue;
+//                    }
+//                }
+//            }
+//        }
         return list;
     }