From 49dbeb1aa1c0c77d2a4f37be5cbdda29eacb75fd Mon Sep 17 00:00:00 2001 From: itzhang <2019326567@qq.com> Date: Mon, 30 Jun 2025 09:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=86=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InvoiceController.java | 4 + .../controller/PastContractController.java | 10 +- .../controller/VendorController.java | 211 +++++++++++++++++- .../java/com/management/task/CrmTask.java | 1 + 4 files changed, 220 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/management/controller/InvoiceController.java b/src/main/java/com/management/controller/InvoiceController.java index 2b066f2..296041d 100644 --- a/src/main/java/com/management/controller/InvoiceController.java +++ b/src/main/java/com/management/controller/InvoiceController.java @@ -49,6 +49,7 @@ public class InvoiceController { //new Filter("IS", "erp_id__c", Arrays.asList("")), new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)), new Filter("EQ", "life_status", Arrays.asList("normal")), + new Filter("N", "is_initial__c", Arrays.asList("yes")), //new Filter("EQ", "name", Arrays.asList("20250527-000010")) new Filter("GT", "create_time", Arrays.asList("1748923200000")) ), "InvoiceApplicationObj"); @@ -245,6 +246,7 @@ public class InvoiceController { //软著版本编码 invoiceMap.put("softworks_number", invoiceData.getString("positive_number__c") != null ? invoiceData.getString("positive_number__c") : ""); + invoiceMap.put("isbzqr", invoiceData.getBoolean("note_confirmed_with_custom__c"));//备注栏信息是否与客户确认 //开始查询明细 JSONObject getInvoiceDetail = crmRequestUtil.getCRMList(Arrays.asList( @@ -404,6 +406,7 @@ public class InvoiceController { new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)), //new Filter("IS", "field_UB1hE__c", Arrays.asList("")), //new Filter("EQ", "name", Arrays.asList("HCFP2505-0003")), + new Filter("N", "is_initial__c", Arrays.asList("yes")), new Filter("GT", "create_time", Arrays.asList("1748923200000")), new Filter("EQ", "life_status", Arrays.asList("normal")) ), "custom_object_example1__c"); @@ -564,6 +567,7 @@ public class InvoiceController { invoiceMap.put("softworks_number", redInvoiceData.getString("registration_number__c") != null ? redInvoiceData.getString("registration_number__c") : "");//软著版本编码 invoiceMap.put("blueinvoiceno", redInvoiceData.getString("original_invoice_number__c") != null ? redInvoiceData.getString("original_invoice_number__c") : "");//待冲蓝字发票号码 invoiceMap.put("redreason", redInvoiceData.getString("redemption_reason__c") != null ? redInvoiceData.getString("redemption_reason__c") : "");//冲红原因 + invoiceMap.put("isbzqr", redInvoiceData.getBoolean("note_confirmed_with_custom__c"));//备注栏信息是否与客户确认 //开始查询明细数据 JSONObject getInvoiceDetail = crmRequestUtil.getCRMList(Arrays.asList( diff --git a/src/main/java/com/management/controller/PastContractController.java b/src/main/java/com/management/controller/PastContractController.java index 67d37b9..68daac9 100644 --- a/src/main/java/com/management/controller/PastContractController.java +++ b/src/main/java/com/management/controller/PastContractController.java @@ -170,7 +170,7 @@ public class PastContractController { erpContractReq.put("iselecsignature", false);//是否电子签章 //是否竣工 - String isComplete = contractData.getString("is_complete__c") != null ? contractData.getString("is_complete__c") : ""; + String isComplete = contractData.getString("is_completed__c") != null ? contractData.getString("is_completed__c") : ""; switch (isComplete) { case "yes": @@ -412,12 +412,12 @@ public class PastContractController { //contractDetailMap.put("material_number", contractDetailData.getString("product_id__r"));//物料编号 contractDetailMap.put("material_number", "80800001");//todo 物料编号 contractDetailMap.put("specification", contractDetailData.getString("specification__c") != null ? contractDetailData.getString("specification__c") : "");//规格 - contractDetailMap.put("baseunit", contractDetailData.getString("unit__c__r") != null ? contractDetailData.getString("unit__c__r") : "");//单位 + //contractDetailMap.put("baseunit", contractDetailData.getString("unit__c__r") != null ? contractDetailData.getString("unit__c__r") : "");//单位 //contractDetailMap.put("baseunit", "TEST0001");//todo 单位 - contractDetailMap.put("unit_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码 + //contractDetailMap.put("unit_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码 contractDetailMap.put("unit1_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码 - contractDetailMap.put("f9w5_unit1_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码 - contractDetailMap.put("baseqty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 + //contractDetailMap.put("f9w5_unit1_number", contractDetailData.getString("unit__c") != null ? contractDetailData.getString("unit__c") : "");//单位编码 + //contractDetailMap.put("baseqty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 contractDetailMap.put("qty", contractDetailData.getBigDecimal("quantity") != null ? contractDetailData.getBigDecimal("quantity") : 0);//数量 contractDetailMap.put("priceandtax", contractDetailData.getBigDecimal("sales_price") != null ? contractDetailData.getBigDecimal("sales_price") : 0);//含税单价 //contractDetailMap.put("taxrateid_number", contractDetailData.getBigDecimal("tax_rate__c") != null ? contractDetailData.getBigDecimal("tax_rate__c") : 0);//税率 diff --git a/src/main/java/com/management/controller/VendorController.java b/src/main/java/com/management/controller/VendorController.java index b828b4b..6684571 100644 --- a/src/main/java/com/management/controller/VendorController.java +++ b/src/main/java/com/management/controller/VendorController.java @@ -26,7 +26,8 @@ public class VendorController { private RestTemplate restTemplate = new RestTemplate(); public static void main(String[] args) { - new VendorController().syncVendor(); + //new VendorController().syncVendor(); + new VendorController().updateVendor(); } /** @@ -140,6 +141,7 @@ public class VendorController { vendorMap.put("status", "C");//数据状态 vendorMap.put("enable", "1");//使用状态 + vendorMap.put("ctrlstrategy", "2"); //供应商最终请求 Map vendorReq = new HashMap<>(); @@ -236,4 +238,211 @@ public class VendorController { } } + /** + * 供应商更新 + * + * @return void + * @Author weiloong_zhang + */ + public void updateVendor() { + CrmRequestUtil crmRequestUtil = new CrmRequestUtil(); + + JSONObject getVendor = crmRequestUtil.getCRMList(Arrays.asList( + new Filter("EQ", "life_status", Arrays.asList("normal")), + new Filter("EQ", "record_type", Arrays.asList("record_ev1gl__c")), + new Filter("EQ", "name", Arrays.asList("衡水景饶电力安装工程有限公司")), + new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")), + new Filter("GT", "create_time", Arrays.asList("1751035349267")) + ), "SupplierObj"); + + JSONObject vendorRes = new JSONObject(); + + try { + vendorRes = restTemplate.postForObject(URLConstant.GET_CUSTOMIZE_LIST_URL, getVendor, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + if (!"success".equals(vendorRes.getString("errorDescription")) || vendorRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) { + log.info("供应商不存在"); + return; + } + + log.info("供应商存在，将继续向下执行"); + + for (Object vendorObj : vendorRes.getJSONObject("data").getJSONArray("dataList")) { + JSONObject vendorData = JSON.parseObject(JSON.toJSONString(vendorObj)); + + System.out.println("当前正在处理的供应商数据为：" + vendorData); + + //开始截取关键数据 + String vendorId = vendorData.getString("_id"); + String vendorName = vendorData.getString("name"); + String createTime = vendorData.getString("last_modified_time"); + + //开始查询日子是否存在当前单据 + JSONObject isLog = new JSONObject(); + + try { + isLog = restTemplate.getForObject("http://localhost:18085/Log/query/log_data?table=send_log_vendor&log_type=供应商更新&dataId=" + vendorId + "&mark=" + createTime, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + if (!isLog.getJSONArray("data").isEmpty()) { + log.info("当前单据已经集成过了，将不再向下执行"); + continue; + } + + log.info("当前单据没有集成过，将开始向下执行"); + + Map vendorMap = new HashMap<>(); + vendorMap.put("number", vendorData.getString("construction_unit_id__c")); + vendorMap.put("name", vendorName); + //简称 + vendorMap.put("simplename", vendorData.getString("supplier_id") != null ? vendorData.getString("supplier_id") : vendorName); + //统一社会信用代码 + vendorMap.put("societycreditcode", vendorData.getString("tax_identification_number") != null ? vendorData.getString("tax_identification_number") : ""); + //纳税人识别号 + vendorMap.put("tx_register_no", vendorData.getString("tax_identification_number") != null ? vendorData.getString("tax_identification_number") : ""); + //U8C编码 + vendorMap.put("f9w5_u8cnumber", vendorData.getString("historical_code__c") != null ? vendorData.getString("historical_code__c") : ""); + +// //联系人封装 +// Map contactMap = new HashMap<>(); +// //联系人名称 +// contactMap.put("contactperson", ""); +// //联系人手机 +// contactMap.put("phone", vendorData.getString("mobile") != null ? vendorData.getString("mobile") : ""); + + //银行分录 + Map bankEntryMap = new HashMap<>(); + //银行账户 + bankEntryMap.put("bankaccount", vendorData.getString("bank") != null ? vendorData.getString("bank") : ""); + //账户名称 + bankEntryMap.put("accountname", vendorData.getString("bank_account") != null ? vendorData.getString("bank_account") : ""); + //银行信息分录默认 + bankEntryMap.put("isdefault_bank", "1"); + //货币代码 + bankEntryMap.put("currency_number", "CNY"); + //开户银行 + bankEntryMap.put("bank_number", vendorData.getString("bank_name__c__r") != null ? vendorData.getString("bank_name__c__r") : ""); + + vendorMap.put("entry_bank", Arrays.asList(bankEntryMap)); + + //分类标准 + Map standardMap = new HashMap<>(); + //分类编码 + standardMap.put("groupid_number", vendorData.getString("find_association__c__r") != null ? vendorData.getString("find_association__c__r") : ""); + //分类标准编码 + standardMap.put("standardid_number", "JBFLBZ"); + + vendorMap.put("entry_groupstandard", Arrays.asList(standardMap)); + + //交易币 + vendorMap.put("settlementcyid_number", "CNY"); + + //创建组织 + //vendorMap.put("createorg_number", "zyierp");//归属部门 + vendorMap.put("createorg_number", "ZHY");//归属部门 + + vendorMap.put("status", "C");//数据状态 + vendorMap.put("enable", "1");//使用状态 + vendorMap.put("ctrlstrategy", "2"); + + //供应商最终请求 + Map vendorReq = new HashMap<>(); + vendorReq.put("data", Arrays.asList(vendorMap)); + + //开始获取token + String accessToken = new KDTokenController().getKDAccessTokenTest(); + + if (accessToken == null || accessToken.equals("")) { + log.info("金蝶token为空或不存在"); + return; + } + String uuid = UUID.randomUUID().toString().replace("-", ""); + //开始封装请求头 + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.set("accessToken", accessToken); + headers.set("Idempotency-Key", uuid); + + HttpEntity vendorReqEntity = new HttpEntity(vendorReq, headers); + + System.out.println(JSON.parseObject(JSON.toJSONString(vendorReqEntity))); + + //String vendorUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/basedata/bd_supplier/bdSupplierSave"; + String vendorUrl = "https://lxr2.zhydsp.cn:40448/ierp/kapi/v2/f9w5/basedata/bd_supplier/bdSupplierSave"; + + JSONObject vendorERPRes = new JSONObject(); + + try { + vendorERPRes = restTemplate.postForObject(vendorUrl, vendorReqEntity, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + + System.out.println(vendorERPRes); + + //开始封装回写程序 + Map backReqMap = new HashMap(); + backReqMap.put("_id", vendorId); + backReqMap.put("dataObjectApiName", "SupplierObj"); + + //开始封装日志 + Map logMap = new HashMap<>(); + logMap.put("log_id", UUID.randomUUID().toString().replace("-", "")); + logMap.put("log_type", "供应商更新"); + logMap.put("syn_type", "1"); + logMap.put("data_name", vendorName); + logMap.put("data_id", vendorId); + logMap.put("mark", createTime); + logMap.put("send_body", JSON.toJSONString(vendorReqEntity)); + logMap.put("send_res", JSON.toJSONString(vendorERPRes)); + logMap.put("tableName", "send_log_vendor"); + + //判断是否执行成功 + if ("0".equals(vendorERPRes.getString("errorCode"))) { + //同步成功 + logMap.put("log_status", "0"); + logMap.put("res_body", "同步成功"); + backReqMap.put("erp_id__c", vendorERPRes.getJSONObject("data").getJSONArray("result").getJSONObject(0).getString("id")); + backReqMap.put("sync_status__c", "option_sync_success__c"); + backReqMap.put("response_status__c", "更新操作同步成功"); + } else { + //同步失败 + logMap.put("log_status", "1"); + logMap.put("res_body", "同步失败：" + vendorERPRes.getString("message")); + backReqMap.put("sync_status__c", "option_sync_failure__c"); + backReqMap.put("response_status__c", "更新失败：" + vendorERPRes.getString("message")); + } + + //开始回写 + JSONObject backReq = crmRequestUtil.updateCRM(backReqMap); + + JSONObject backRes = new JSONObject(); + + try { + backRes = restTemplate.postForObject(URLConstant.UPDATE_CRM_CUSTOMIZE, backReq, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("回写结果为：" + backRes); + + //开始记录日志 + JSONObject logRes = new JSONObject(); + try { + logRes = restTemplate.postForObject("http://localhost:18085/Log/insert/log_data", logMap, JSONObject.class); + } catch (RestClientException e) { + e.printStackTrace(); + } + + System.out.println("日志插入结果为：" + logRes); + + } + } + } diff --git a/src/main/java/com/management/task/CrmTask.java b/src/main/java/com/management/task/CrmTask.java index b2b08ea..8a87bd7 100644 --- a/src/main/java/com/management/task/CrmTask.java +++ b/src/main/java/com/management/task/CrmTask.java @@ -82,6 +82,7 @@ public class CrmTask { // tenderingController.syncTendering(); // bankInfoController.syncBankInfo(); // vendorController.syncVendor(); +// vendorController.updateVendor(); // System.out.println("ERP数据执行完毕"); // }