|
|
@@ -220,7 +220,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select ecrd_id,emd_id from ecr left join ecrmakedetail on emd_ecrid=ecr_id left join ecrdetail on ecrd_ecrid=ecr_id and emd_maprodcode=ecrd_mothercode where emd_id=" + store.get("ID"));
|
|
|
while (rs.next()){
|
|
|
EcrMakeDetail ecrMakeDetail = baseDao.getJdbcTemplate().queryForObject("select ecr_code,emd_macode,ecr_tempg,ecr_tempb,ecr_tempc,'" + status + "' status,case when nvl(emd_ifzhix,0)=0 then '否' else '是' end emd_ifzhix,emd_controlpoint,emd_detno||'' emd_detno," +
|
|
|
- "'' rmk2,'' rmk3,'' rmk4,'' rmk5,ecrd_type,ecrd_soncode,ecrd_newbaseqty,ecrd_repcode,ecrd_oldbaseqty,ecrd_location,ecrd_oldlocation,'"+tokenConfig.get("mesUser")+"' mesUser,'"+MD5Util.encodeByMD5(tokenConfig.get("mesPwd"))+"' mesPwd " +
|
|
|
+ "'' rmk2,'' rmk3,'' rmk4,'' rmk5,ecrd_type,ecrd_soncode,nvl(ecrd_newbaseqty,0) ecrd_newbaseqty,ecrd_repcode,nvl(ecrd_oldbaseqty,0) ecrd_oldbaseqty,ecrd_location,ecrd_oldlocation,'"+tokenConfig.get("mesUser")+"' mesUser,'"+MD5Util.encodeByMD5(tokenConfig.get("mesPwd"))+"' mesPwd " +
|
|
|
"from ecr left join ecrmakedetail on emd_ecrid=ecr_id left join ecrdetail on ecrd_ecrid=ecr_id and emd_maprodcode=ecrd_mothercode where emd_id=? and ecrd_id=?",
|
|
|
new BeanPropertyRowMapper<EcrMakeDetail>(EcrMakeDetail.class), rs.getGeneralInt("emd_id"),rs.getGeneralInt("ecrd_id"));
|
|
|
ecrMakeDetails.add(ecrMakeDetail);
|
koul