|
|
@@ -229,7 +229,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
hashMap.put("code", 0);
|
|
|
int count = baseDao.getCount("select count(1) from MakeScrap where ms_id="+msId);
|
|
|
if (count>0) {
|
|
|
- List<MakeScrapDetail> makeScrapDetail = baseDao.getJdbcTemplate().query("select ms_code,ms_id,md_detno,1 issw,md_mmcode,md_mmdetno,md_prodcode,mm_prodcode,md_qty,"+mesUser+" mesUser,"+mesPwd+" mesPwd,"+flag+" flag from MakeScrap left join MakeScrapDetail on ms_id=md_msid left join MakeMaterial on mm_code=md_mmcode and mm_detno=md_mmdetno where ms_id="+ msId,new Object[]{},new BeanPropertyRowMapper<MakeScrapDetail>(MakeScrapDetail.class));
|
|
|
+ List<MakeScrapDetail> makeScrapDetail = baseDao.getJdbcTemplate().query("select ms_code,ms_id,md_detno,1 issw,md_mmcode,md_mmdetno,md_prodcode,mm_prodcode,md_qty,'"+mesUser+"' mesUser,'"+mesPwd+"' mesPwd,"+flag+" flag from MakeScrap left join MakeScrapDetail on ms_id=md_msid left join MakeMaterial on mm_code=md_mmcode and mm_detno=md_mmdetno where ms_id="+ msId,new Object[]{},new BeanPropertyRowMapper<MakeScrapDetail>(MakeScrapDetail.class));
|
|
|
Map<String, Object> map = syncMESDeleteMake(JSON.toJSONString(makeScrapDetail, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeScrap"));
|
|
|
hashMap.put("code", -1);
|
|
|
hashMap.put("msg", "MES异常，请联系MES处理！");
|
koul