|
|
@@ -209,7 +209,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
@Override
|
|
|
public Map<String, Object> updateChangeOrderByErp(String data) {
|
|
|
Map<String, Object> hashMap = new HashMap<>();
|
|
|
- hashMap.put("code", 0);
|
|
|
+ hashMap.put("code", "10001");
|
|
|
hashMap.put("msg", "参数异常，请联系管理员！");
|
|
|
List<Map<Object, Object>> maps = BaseUtil.parseGridStoreToMaps(data);
|
|
|
List<EcrMakeDetail> ecrMakeDetails = new ArrayList<>();
|
|
|
@@ -219,6 +219,11 @@ public class ERPServiceImpl implements ERPService {
|
|
|
String status = "AUDITED".equals(s) ? "已审核" : "COMMITED".equals(s) ? "已提交" : "已删除";
|
|
|
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()){
|
|
|
+ if (!baseDao.checkIf("ecr left join ecrmakedetail on emd_ecrid=ecr_id left join ecrdetail on ecrd_ecrid=ecr_id and emd_maprodcode=ecrd_mothercode","emd_id="+rs.getGeneralInt("emd_id")+" and ecrd_id="+rs.getGeneralInt("ecrd_id"))){
|
|
|
+ hashMap.put("code", "10002");
|
|
|
+ hashMap.put("msg", "数据错误，请核对数据后对接MES处理！");
|
|
|
+ return hashMap;
|
|
|
+ }
|
|
|
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,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=?",
|
koul