Merge branch 'dev' of crk-java-qinghai/armyfoodSrcQh into master

src/main/java/com/unis/crk/business/kcgl/service/impl/DataKcglQckcDefaultServiceImpl.java

@@ -220,8 +220,6 @@ public class DataKcglQckcDefaultServiceImpl extends ServiceImpl<DataKcglQckcDefa
         //表示此仓房货位已有数据
         DataKcglKcswDefault one = dataKcglKcswDefaultService.getOne(queryWrapper);
         if (one != null){
-            //表示此时与仓房货位的品种、性质不一致
-            if (!StringUtils.equals(one.getHwxz(),hwxz) || !StringUtils.equals(one.getPz(),pz))
             return false;
         }
         return true;