diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java index 0f868492..8d17b940 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java @@ -170,7 +170,9 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot for(WmOmNoticeIEntity wmOmNoticeI:wmOmNoticeIList){ if(oConvertUtils.isEmpty(wmOmNoticeI.getId())){ //外键设置 - MvGoodsEntity mvgoods = new MvGoodsEntity(); +// MvGoodsEntity mvgoods = new MvGoodsEntity(); + MvGoodsEntity mvgoods = this.findUniqueByProperty(MvGoodsEntity.class,"goodsName",wmOmNoticeI.getGoodsId()); + mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmOmNoticeI.getGoodsId()) ; wmOmNoticeI.setGoodsUnit(mvgoods.getShlDanWei()); wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit()); diff --git a/src/main/java/org/jeecgframework/core/common/dao/jdbc/SimpleJdbcTemplate.java b/src/main/java/org/jeecgframework/core/common/dao/jdbc/SimpleJdbcTemplate.java index de50d8f0..a7bcf76f 100644 --- a/src/main/java/org/jeecgframework/core/common/dao/jdbc/SimpleJdbcTemplate.java +++ b/src/main/java/org/jeecgframework/core/common/dao/jdbc/SimpleJdbcTemplate.java @@ -90,9 +90,9 @@ public class SimpleJdbcTemplate { Assert.hasText(sql,"sql语句不正确!"); if(parameters!=null){ - return namedJdbcTemplate.queryForObject(sql, parameters,Long.class); + return (long)namedJdbcTemplate.queryForObject(sql, parameters,Long.class); }else{ - return jdbcTemplate.queryForObject(sql,Long.class); + return (long)jdbcTemplate.queryForObject(sql,Long.class); } }catch (Exception e) { diff --git a/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp b/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp index 00a596a4..4767dcc1 100644 --- a/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp +++ b/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp @@ -183,7 +183,7 @@ function downloadqrcode() { 货主:${cusname} - 客户:${ocusname} + 客户:${wmOmNoticeHPage.delvMember}${wmOmNoticeHPage.delvMobile}