工单删除接口调整

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

@@ -108,38 +108,32 @@ public class ERPServiceImpl implements ERPService {
             Map<String, Object> map = syncMESDeleteMake(JSON.toJSONString(make, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBase"));
             hashMap.put("code", -1);
             hashMap.put("msg", "删除工单异常，请联系MES处理！");
-            logger.info(StringUtil.nvl(map,""));
             if (map != null) {
                 int code = Integer.parseInt(StringUtil.nvl(map.get("code"), "-1"));
-                logger.info(StringUtil.nvl(code,""));
                 if (code == 0) {
-                    logger.info(StringUtil.nvl(code,""));
-                    MakeMaterial makeMaterial = baseDao.getJdbcTemplate().queryForObject("select mm_code,erpid,mm_prodcode,pr_detail,replace(PR_SPEC,'''','''''') pr_spec,pr_unit,mm_oneuseqty qty,mm_qty,mm_oneuseqty,'main' type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,0 bo_version,nvl(bo_cop,'BYT') bo_cop,mm_prodcode mm_repprodcode,mm_balance,(select nvl(cu_mescode,'BYT') from Product left join customer on pr_kh_user=cu_shortname where pr_code=ma_prodcode) ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder," + flag + " flag,0 rpid from mes_makematerial left join make on ma_id=mm_maid left join Product on mm_prodcode=pr_code left join bom on bo_id=mm_bomid left join (select max(mc_indate) mc_indate,max(mc_recorder) mc_recorder,max(md_mmdetno) md_mmdetno,max(md_makecode) md_makecode from MakeMaterialChangeDet left join MakeMaterialChange on mc_id=md_mcid) on md_makecode=ma_code and md_mmdetno=mm_detno where mm_maid=? order by mm_detno", new BeanPropertyRowMapper<MakeMaterial>(MakeMaterial.class), maId);
-                    logger.info(StringUtil.nvl(makeMaterial,""));
-                    makeMaterial.setMesUser(tokenConfig.get("mesUser"));
-                    makeMaterial.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
-                    logger.info(StringUtil.nvl(makeMaterial,""));
-                    Map<String, Object> map1 = syncMESDeleteMake(JSON.toJSONString(makeMaterial, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBaseDetail"));
-                    hashMap.put("msg", "删除BOM异常，请联系MES处理！");
-                    logger.info(StringUtil.nvl(map,""));
-                    if (map1 != null) {
-                        int code1 = Integer.parseInt(StringUtil.nvl(map1.get("code"), "-1"));
-                        logger.info(StringUtil.nvl(code1,""));
-                        if (code1 == 0) {
-                            MakeMaterial makeMaterial2 = baseDao.getJdbcTemplate().queryForObject("select mm.mm_code,mm.erpid,mr.mp_prodcode mm_prodcode,pr_detail,replace(PR_SPEC,'''','''''') pr_spec,pr_unit,mm.mm_oneuseqty qty,mr.mp_canuseqty mm_qty,mm.mm_oneuseqty,'alternative' type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,0 bo_version,nvl(bo_cop,'BYT') bo_cop,mm.mm_prodcode mm_repprodcode,mm.mm_balance,(select nvl(cu_mescode,'BYT') from Product left join customer on pr_kh_user=cu_shortname where pr_code=ma_prodcode) ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder," + flag + " flag,mr.erpid rpid from mes_makematerialreplace mr left join mes_makematerial mm on mr.mp_mmid=mm.erpid left join make on mm.mm_maid=ma_id left join Product on mr.mp_prodcode=pr_code left join bom on bo_id=mm.mm_bomid left join (select max(mc_indate) mc_indate,max(mc_recorder) mc_recorder,max(md_mmdetno) md_mmdetno,max(md_makecode) md_makecode from MakeMaterialChangeDet left join MakeMaterialChange on mc_id=md_mcid) on md_makecode=ma_code and md_mmdetno=mm.mm_detno where mr.mp_maid=?", new BeanPropertyRowMapper<MakeMaterial>(MakeMaterial.class), maId);
-                            makeMaterial2.setMesUser(tokenConfig.get("mesUser"));
-                            makeMaterial2.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
-                            Map<String, Object> map2 = syncMESDeleteMake(JSON.toJSONString(makeMaterial2, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBaseDetail"));
-                            hashMap.put("msg", "删除替代料异常，请联系MES处理！");
-                            logger.info(StringUtil.nvl(map,""));
-                            if (map2 != null) {
-                                int code2 = Integer.parseInt(StringUtil.nvl(map2.get("code"), "-1"));
-                                hashMap.put("code", code2);
-                                hashMap.put("msg", map2.get("msg"));
-                            }
+                    List<MakeMaterial> makeMaterials = baseDao.getJdbcTemplate().queryForList("select mm_code,erpid,mm_prodcode,pr_detail,replace(PR_SPEC,'''','''''') pr_spec,pr_unit,mm_oneuseqty qty,mm_qty,mm_oneuseqty,'main' type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,0 bo_version,nvl(bo_cop,'BYT') bo_cop,mm_prodcode mm_repprodcode,mm_balance,(select nvl(cu_mescode,'BYT') from Product left join customer on pr_kh_user=cu_shortname where pr_code=ma_prodcode) ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder," + flag + " flag,0 rpid from mes_makematerial left join make on ma_id=mm_maid left join Product on mm_prodcode=pr_code left join bom on bo_id=mm_bomid left join (select max(mc_indate) mc_indate,max(mc_recorder) mc_recorder,max(md_mmdetno) md_mmdetno,max(md_makecode) md_makecode from MakeMaterialChangeDet left join MakeMaterialChange on mc_id=md_mcid) on md_makecode=ma_code and md_mmdetno=mm_detno where mm_maid=" + maId + " order by mm_detno", MakeMaterial.class);
+                    for (MakeMaterial makeMaterial: makeMaterials) {
+                        makeMaterial.setMesUser(tokenConfig.get("mesUser"));
+                        makeMaterial.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
+                        Map<String, Object> map1 = syncMESDeleteMake(JSON.toJSONString(makeMaterial, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBaseDetail"));
+                        hashMap.put("msg", "删除BOM异常，请联系MES处理！");
+                        if (map1 != null) {
+                            int code1 = Integer.parseInt(StringUtil.nvl(map1.get("code"), "-1"));
+                            hashMap.put("code", code1);
+                            hashMap.put("msg", map1.get("msg"));
+                        }
+                    }
+                    List<MakeMaterial> makeMaterials2 = baseDao.getJdbcTemplate().queryForList("select mm.mm_code,mm.erpid,mr.mp_prodcode mm_prodcode,pr_detail,replace(PR_SPEC,'''','''''') pr_spec,pr_unit,mm.mm_oneuseqty qty,mr.mp_canuseqty mm_qty,mm.mm_oneuseqty,'alternative' type,bo_recorder,to_char(bo_date,'yyyy-MM-dd HH24:mi:ss') bo_date,0 bo_version,nvl(bo_cop,'BYT') bo_cop,mm.mm_prodcode mm_repprodcode,mm.mm_balance,(select nvl(cu_mescode,'BYT') from Product left join customer on pr_kh_user=cu_shortname where pr_code=ma_prodcode) ma_custcode,to_char(mc_indate,'yyyy-MM-dd HH24:mi:ss') mc_indate,mc_recorder," + flag + " flag,mr.erpid rpid from mes_makematerialreplace mr left join mes_makematerial mm on mr.mp_mmid=mm.erpid left join make on mm.mm_maid=ma_id left join Product on mr.mp_prodcode=pr_code left join bom on bo_id=mm.mm_bomid left join (select max(mc_indate) mc_indate,max(mc_recorder) mc_recorder,max(md_mmdetno) md_mmdetno,max(md_makecode) md_makecode from MakeMaterialChangeDet left join MakeMaterialChange on mc_id=md_mcid) on md_makecode=ma_code and md_mmdetno=mm.mm_detno where mr.mp_maid="+ maId,MakeMaterial.class);
+                    for (MakeMaterial makeMaterial: makeMaterials2) {
+                        makeMaterial.setMesUser(tokenConfig.get("mesUser"));
+                        makeMaterial.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));
+                        Map<String, Object> map2 = syncMESDeleteMake(JSON.toJSONString(makeMaterial, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncMakeBaseDetail"));
+                        hashMap.put("msg", "删除替代料异常，请联系MES处理！");
+                        if (map2 != null) {
+                            int code2 = Integer.parseInt(StringUtil.nvl(map2.get("code"), "-1"));
+                            hashMap.put("code", code2);
+                            hashMap.put("msg", map2.get("msg"));
                         }
-                        hashMap.put("code", code1);
-                        hashMap.put("msg", map1.get("msg"));
                     }
                 }
                 hashMap.put("code", code);