mengy před 5 roky
rodič
revize
34aa6ab874

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

@@ -2015,7 +2015,7 @@
2015 2015
         and bswd.type = "notice"
2016 2016
       </if>
2017 2017
     </where>
2018
-      GROUP BY sqk.id,bswd.in_price
2018
+      /*GROUP BY sqk.id,bswd.in_price*/
2019 2019
       order by sqk.id desc
2020 2020
   </select>
2021 2021
 

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

@@ -192,7 +192,7 @@ public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoServ
192 192
         }
193 193
         //1.6收货年度scnf
194 194
         if(StringUtils.isNoneBlank(qualitycheckVo.getScnf())){
195
-            foodbasicInfo.setGrowYear(Integer.valueOf(qualitycheckVo.getScnf()));
195
+            foodbasicInfo.setGrowYear(Integer.valueOf(qualitycheckVo.getScnfName()));
196 196
         }
197 197
         //⑤其他
198 198
         foodbasicInfo.setKeepUnite(qualitycheckVo.getDepotName());//所属库点名称