【功能完善】【评审单上传逻辑更改】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -215,9 +215,9 @@ public class ERPServiceImpl implements ERPService {
         List<EcrMakeDetail> ecrMakeDetails = new ArrayList<>();
         Map<String, Object> ma = new HashMap<>();
         if (maps.size()>0) {
-            boolean b = false;
+            boolean b = true;
             if (baseDao.checkIf("ecrmakedetail left join ecr on emd_ecrid=ecr_id", "nvl(ecr_tempg,' ')='机型BOM变更' and emd_id=" + maps.get(0).get("ID"))) {
-                b = true;
+                b = false;
             }
             for (Map<Object, Object> store : maps) {
                 String s = store.get("STATUS") == null ? "" : store.get("STATUS").toString();
@@ -236,24 +236,13 @@ public class ERPServiceImpl implements ERPService {
                                 new BeanPropertyRowMapper<EcrMakeDetail>(EcrMakeDetail.class), rs.getGeneralInt("emd_id"), rs.getGeneralInt("ecrd_id"));
                         ecrMakeDetails.add(ecrMakeDetail);
                     }
-                } else {
-                    if (!baseDao.checkIf("ecr left join ecrmakedetail on emd_ecrid=ecr_id", "emd_id=" + store.get("ID"))) {
-                        hashMap.put("code", "10002");
-                        hashMap.put("msg", "数据错误，请核对数据后对接MES处理！");
-                        return hashMap;
+                    ma.put("Data", ecrMakeDetails);
+                    Map<String, Object> map = syncMESCheckBomItems(JSON.toJSONString(ma, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("updateChangeOrderByErp"));
+                    if (map != null) {
+                        int msgId = Integer.parseInt(StringUtil.nvl(map.get("code"), "-1"));
+                        hashMap.put("code", msgId);
+                        hashMap.put("msg", map.get("msg"));
                     }
-                    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,0 ecrd_newbaseqty,'' ecrd_repcode,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 where emd_id=?",
-                            new BeanPropertyRowMapper<EcrMakeDetail>(EcrMakeDetail.class), store.get("ID"));
-                    ecrMakeDetails.add(ecrMakeDetail);
-                }
-                ma.put("Data", ecrMakeDetails);
-                Map<String, Object> map = syncMESCheckBomItems(JSON.toJSONString(ma, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("updateChangeOrderByErp"));
-                if (map != null) {
-                    int msgId = Integer.parseInt(StringUtil.nvl(map.get("code"), "-1"));
-                    hashMap.put("code", msgId);
-                    hashMap.put("msg", map.get("msg"));
                 }
             }
         }