|
|
@@ -268,7 +268,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
hashMap.put("code", 0);
|
|
|
int count = baseDao.getCount("select count(1) from SendNotify where sn_id="+snId);
|
|
|
if (count>0) {
|
|
|
- SendNotify sendNotify = baseDao.getJdbcTemplate().queryForObject("select sn_code,sn_custcode,nvl(sn_isvmi,0) sn_isvmi,sn_recordername,sn_remark,sn_remark2,sn_packingremark,nvl(sn_cop,'BYT') sn_cop," + flag + " flag from SendNotify where sn_id=?", new BeanPropertyRowMapper<SendNotify>(SendNotify.class), snId);
|
|
|
+ SendNotify sendNotify = baseDao.getJdbcTemplate().queryForObject("select sn_code,nvl(cu_mescode,sn_custcode) sn_custcode,nvl(sn_isvmi,0) sn_isvmi,sn_recordername,sn_remark,sn_remark2,sn_packingremark,nvl(sn_cop,'BYT') sn_cop," + flag + " flag from SendNotify left join Customer on sn_custcode=cu_code where sn_id=?", new BeanPropertyRowMapper<SendNotify>(SendNotify.class), snId);
|
|
|
sendNotify.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
|
|
|
sendNotify.setMesUser(tokenConfig.get("mesUser"));
|
|
|
List<SendNotifyDetail> sendNotifyDetails = baseDao.getJdbcTemplate().query("select snd_ordercode,snd_prodcode,snd_outqty,nvl(A.cd_varchar50_1,snd_warehousecode) snd_warehousecode,snd_orderdetno,snd_id,"+flag+" flag from SendNotifyDetail left join (select cd_varchar50_3,cd_varchar50_1 from customtable left join customtabledetail on ct_id=cd_ctid where ct_caller='MESWarehouse') A on A.cd_varchar50_3=snd_warehousecode where snd_snid="+ snId,new Object[]{},new BeanPropertyRowMapper<SendNotifyDetail>(SendNotifyDetail.class));
|
koul