|
|
@@ -232,10 +232,10 @@ public class ERPServiceImpl implements ERPService {
|
|
|
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> ma = new HashMap<>();
|
|
|
ma.put("data",makeScrapDetail);
|
|
|
- Map<String, Object> map = syncMESDeleteMake(JSON.toJSONString(ma, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeScrap"));
|
|
|
+ Map<String, Object> map = syncMESCheckBomItems(JSON.toJSONString(ma, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeScrap"));
|
|
|
hashMap.put("code", -1);
|
|
|
hashMap.put("msg", "MES异常，请联系MES处理！");
|
|
|
- if (map != null&&map.isEmpty()) {
|
|
|
+ if (map != null&&!map.isEmpty()) {
|
|
|
int code = Integer.parseInt(StringUtil.nvl(map.get("code"), "-1"));
|
|
|
hashMap.put("code", code);
|
|
|
hashMap.put("msg", map.get("msg"));
|
koul