diff --git a/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/RemoteJindieService.java b/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/RemoteJindieService.java index 82cea11..da65c40 100644 --- a/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/RemoteJindieService.java +++ b/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/RemoteJindieService.java @@ -21,7 +21,7 @@ public interface RemoteJindieService { /** 同步供应商*/ @PostMapping("/jindie/syncSupplierInfoFromErp") - R syncSupplierInfoFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R syncSupplierInfoFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** 同步物料*/ @PostMapping("/jindie/syncMaterialInfoFromErp") @@ -29,14 +29,14 @@ public interface RemoteJindieService { /** 同步项目信息*/ @PostMapping("/jindie/syncProjectInfoFromErp") - R syncProjectInfoFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R syncProjectInfoFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** 同步销售订单*/ @PostMapping("/jindie/syncSaleOrderFromErp") - R syncSaleOrderFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R syncSaleOrderFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** 同步采购订单*/ @PostMapping("/jindie/syncPurchaseOrderFromErp") - R syncPurchaseOrderFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R syncPurchaseOrderFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/factory/RemoteJindieFallbackFactory.java b/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/factory/RemoteJindieFallbackFactory.java index ec794b8..504314c 100644 --- a/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/factory/RemoteJindieFallbackFactory.java +++ b/hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/factory/RemoteJindieFallbackFactory.java @@ -16,7 +16,7 @@ public class RemoteJindieFallbackFactory implements FallbackFactory syncSupplierInfoFromErp(String source) { + public R syncSupplierInfoFromErp(ErpSyncInfoVo erpSyncInfoVo,String source) { return R.fail("同步供应商信息失败:" + throwable.getMessage()); } @@ -26,17 +26,17 @@ public class RemoteJindieFallbackFactory implements FallbackFactory syncProjectInfoFromErp(String source) { + public R syncProjectInfoFromErp(ErpSyncInfoVo erpSyncInfoVo,String source) { return R.fail("同步项目信息失败:" + throwable.getMessage()); } @Override - public R syncSaleOrderFromErp(String source) { + public R syncSaleOrderFromErp(ErpSyncInfoVo erpSyncInfoVo,String source) { return R.fail("同步销售订单信息失败:" + throwable.getMessage()); } @Override - public R syncPurchaseOrderFromErp(String source) { + public R syncPurchaseOrderFromErp(ErpSyncInfoVo erpSyncInfoVo,String source) { return R.fail("同步采购订单信息失败:" + throwable.getMessage()); } }; diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java index 53ae338..55aa14b 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java @@ -38,9 +38,9 @@ public class KingdeeErpSyncController { @PostMapping("/syncSupplierInfoFromErp") @Log(title = "ERP供应商信息", businessType = BusinessType.INSERT) @InnerAuth - public AjaxResult syncSupplierInfoFromErp() { + public AjaxResult syncSupplierInfoFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) { try { - return AjaxResult.success(kingdeeErpSyncService.syncSupplierInfoFromErp(0)); + return AjaxResult.success(kingdeeErpSyncService.syncSupplierInfoFromErp(0, erpSyncInfoVo)); } catch (Exception e) { logger.error("同步供应商信息错误:" + e.getMessage()); return AjaxResult.error(); @@ -70,9 +70,9 @@ public class KingdeeErpSyncController { @PostMapping("/syncProjectInfoFromErp") @Log(title = "ERP项目信息", businessType = BusinessType.INSERT) @InnerAuth - public AjaxResult syncProjectInfoFromErp() { + public AjaxResult syncProjectInfoFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) { try { - return AjaxResult.success(kingdeeErpSyncService.syncProjectInfoFromErp(0)); + return AjaxResult.success(kingdeeErpSyncService.syncProjectInfoFromErp(0, erpSyncInfoVo)); } catch (Exception e) { logger.error("同步项目信息错误:" + e.getMessage()); return AjaxResult.error(); @@ -85,9 +85,9 @@ public class KingdeeErpSyncController { @PostMapping("/syncSaleOrderFromErp") @Log(title = "ERP销售订单", businessType = BusinessType.INSERT) @InnerAuth - public AjaxResult syncSaleOrderFromErp() { + public AjaxResult syncSaleOrderFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) { try { - return AjaxResult.success(kingdeeErpSyncService.syncSaleOrderFromErp(0)); + return AjaxResult.success(kingdeeErpSyncService.syncSaleOrderFromErp(0, erpSyncInfoVo)); } catch (Exception e) { logger.error("同步销售订单信息错误:" + e.getMessage()); return AjaxResult.error(); @@ -101,9 +101,9 @@ public class KingdeeErpSyncController { @PostMapping("/syncPurchaseOrderFromErp") @Log(title = "ERP采购订单", businessType = BusinessType.INSERT) @InnerAuth - public AjaxResult syncPurchaseOrderFromErp() { + public AjaxResult syncPurchaseOrderFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) { try { - return AjaxResult.success(kingdeeErpSyncService.syncPurchaseOrderFromErp(0)); + return AjaxResult.success(kingdeeErpSyncService.syncPurchaseOrderFromErp(0, erpSyncInfoVo)); } catch (Exception e) { logger.error("同步采购订单信息错误:" + e.getMessage()); return AjaxResult.error(); diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesSaleOrder.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesSaleOrder.java index 6cdbc80..249d5ec 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesSaleOrder.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesSaleOrder.java @@ -113,6 +113,9 @@ public class MesSaleOrder extends BaseEntity { @Excel(name = "是否已下达计划", readConverterExp = "1=-是,0-否") private String isRelease; + /**规格型号*/ + private String materialModel; + /** * 审核日期;对应FApproveDate */ @@ -352,6 +355,14 @@ public class MesSaleOrder extends BaseEntity { return isRelease; } + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + public void setApproveDate(Date approveDate) { this.approveDate = approveDate; } diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/IKingdeeErpSyncService.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/IKingdeeErpSyncService.java index 17435c3..1cac101 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/IKingdeeErpSyncService.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/IKingdeeErpSyncService.java @@ -4,9 +4,9 @@ import com.hw.jindie.api.domain.vo.ErpSyncInfoVo; public interface IKingdeeErpSyncService { - public int syncSupplierInfoFromErp(int startRow) throws Exception; + public int syncSupplierInfoFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception; public int syncMaterialInfoFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception; - public int syncProjectInfoFromErp(int startRow) throws Exception; - public int syncSaleOrderFromErp(int startRow) throws Exception; - public int syncPurchaseOrderFromErp(int startRow) throws Exception; + public int syncProjectInfoFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception; + public int syncSaleOrderFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception; + public int syncPurchaseOrderFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception; } diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java index 2fedf6b..c2e7f22 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java @@ -44,8 +44,9 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { * @Description:从金蝶ERP同步供应商信息 */ @Override - public int syncSupplierInfoFromErp(int startRow) throws Exception { - String maxErpModifyDate = mesBaseSupplierInfoMapper.selectMaxErpModifyDate(); + public int syncSupplierInfoFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception { + String maxErpModifyDate = StringUtils.isEmpty(erpSyncInfoVo.getMaxErpModifyDate()) ? + mesBaseSupplierInfoMapper.selectMaxErpModifyDate() : erpSyncInfoVo.getMaxErpModifyDate(); return syncSupplierInfoFromErp(startRow, maxErpModifyDate); } @@ -162,7 +163,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } } - System.out.println("size:"+resultArray.size()); + System.out.println("size:" + resultArray.size()); //如果返回的数组的数量等于分页数量,则继续获取下一页数据 if (resultArray.size() == limit) { // System.out.println(startRow); @@ -184,7 +185,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { @Override public int syncMaterialInfoFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception { String maxErpModifyDate = StringUtils.isEmpty(erpSyncInfoVo.getMaxErpModifyDate()) - ?mesBaseMaterialInfoMapper.selectMaxErpModifyDate():erpSyncInfoVo.getMaxErpModifyDate(); + ? mesBaseMaterialInfoMapper.selectMaxErpModifyDate() : erpSyncInfoVo.getMaxErpModifyDate(); return syncMaterialInfoFromErp(startRow, maxErpModifyDate); } @@ -306,7 +307,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } } - System.out.println("size:"+resultArray.size()); + System.out.println("size:" + resultArray.size()); /**分页递归获取所有物料信息*/ if (resultArray.size() == limit) { // System.out.println(startRow); @@ -326,8 +327,9 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { * @Descrption:从金蝶ERP同步销售订单 */ @Override - public int syncSaleOrderFromErp(int startRow) throws Exception { - String maxErpModifyDate = mesSaleOrderMapper.selectMaxErpModifyDate(); + public int syncSaleOrderFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception { + String maxErpModifyDate = StringUtils.isEmpty(erpSyncInfoVo.getMaxErpModifyDate())? + mesSaleOrderMapper.selectMaxErpModifyDate():erpSyncInfoVo.getMaxErpModifyDate(); return syncSaleOrderFromErp(startRow, maxErpModifyDate); } @@ -335,7 +337,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { * @throws Exception * @Descrption:从金蝶ERP同步销售订单 */ - public int syncSaleOrderFromErp(int startRow,String maxErpModifyDate) throws Exception { + public int syncSaleOrderFromErp(int startRow, String maxErpModifyDate) throws Exception { K3CloudApi api = new K3CloudApi(); // String FDocumentStatus = "C"; // String json = "{\n" + @@ -351,7 +353,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { JSONObject queryJson = new JSONObject(); String formId = "SAL_SaleOrder"; - String fieldKeys = "FID,FBillNo,FApproveDate,FSaleOrderEntry_FEntryID,FMaterialId,FMaterialId.FNumber,FMaterialName,FDocumentStatus," + + String fieldKeys = "FID,FBillNo,FApproveDate,FSaleOrderEntry_FEntryID,FSaleOrderEntry_FMaterialModel,FMaterialId,FMaterialId.FNumber,FMaterialName,FDocumentStatus," + "FQty,FCreateDate,FModifyDate,FMinPlanDeliveryDate,FAuxPropId,FStockId,FOwnerId,FSaleDeptId,FPrice,FStockOrgId,F_TOND_Base"; // // String filterString = "FNumber='98010102'"; @@ -391,13 +393,15 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { JSONObject resultObject = (JSONObject) resultArray.get(i); MesSaleOrder mesSaleOrder = new MesSaleOrder(); //erp主键 - Long erpId = resultObject.getLong("FID"); + Long erpId = resultObject.getLong("FID"); //销售订单编号id String saleOrderCode = resultObject.getString("FBillNo"); //审核日期 String approveDate = resultObject.getString("FApproveDate"); //订单明细id Long fentyrId = resultObject.getLong("FSaleOrderEntry.FEntryID"); + //订单明细规格 + String materialModel = resultObject.getString("FSaleOrderEntry.FMaterialModel"); //ERP物料id Long fmaterialId = resultObject.getLong("FMaterialId"); //物料编码 @@ -430,6 +434,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { mesSaleOrder.setErpId(erpId); mesSaleOrder.setSaleorderCode(saleOrderCode); mesSaleOrder.setFentryId(fentyrId); + mesSaleOrder.setMaterialModel(materialModel); mesSaleOrder.setDocumentStatus(documentStatus); //erp物料id mesSaleOrder.setMaterialId(fmaterialId); @@ -480,13 +485,13 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } } - System.out.println("size:"+resultArray.size()); + System.out.println("size:" + resultArray.size()); /**分页递归获取所有物料信息*/ if (resultArray.size() == limit) { // System.out.println(startRow); //通过递归同步所有物料信息,测试先不用 - int i = syncSaleOrderFromErp(startRow + resultArray.size(),maxErpModifyDate); + int i = syncSaleOrderFromErp(startRow + resultArray.size(), maxErpModifyDate); // return i; return 1; } else { @@ -501,16 +506,17 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { * @Descrption:从金蝶ERP同步项目信息 */ @Override - public int syncProjectInfoFromErp(int startRow) throws Exception { - String maxErpModifyDate = mesProjectInfoMapper.selectMaxErpModifyDate(); - return syncProjectInfoFromErp(startRow,maxErpModifyDate); + public int syncProjectInfoFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception { + String maxErpModifyDate = StringUtils.isEmpty(erpSyncInfoVo.getMaxErpModifyDate())? + mesProjectInfoMapper.selectMaxErpModifyDate(): erpSyncInfoVo.getMaxErpModifyDate(); + return syncProjectInfoFromErp(startRow, maxErpModifyDate); } /** * @throws Exception * @Descrption:从金蝶ERP同步项目信息 */ - public int syncProjectInfoFromErp(int startRow,String maxErpModifyDate) throws Exception { + public int syncProjectInfoFromErp(int startRow, String maxErpModifyDate) throws Exception { K3CloudApi api = new K3CloudApi(); // String FDocumentStatus = "C"; @@ -600,12 +606,12 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } } - System.out.println("size:"+resultArray.size()); + System.out.println("size:" + resultArray.size()); /**分页递归获取所有物料信息*/ if (resultArray.size() == limit) { // System.out.println(startRow); //通过递归同步所有物料信息,测试先不用 - int i = syncProjectInfoFromErp(startRow + resultArray.size(),maxErpModifyDate); + int i = syncProjectInfoFromErp(startRow + resultArray.size(), maxErpModifyDate); // return i; return 1; } else { @@ -619,16 +625,17 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { * @Descrption:从金蝶ERP同步采购订单 */ @Override - public int syncPurchaseOrderFromErp(int startRow) throws Exception { - String maxErpModifyDate = mesPurchaseOrderMapper.selectMaxErpModifyDate(); - return syncPurchaseOrderFromErp(startRow,maxErpModifyDate); + public int syncPurchaseOrderFromErp(int startRow, ErpSyncInfoVo erpSyncInfoVo) throws Exception { + String maxErpModifyDate = StringUtils.isEmpty(erpSyncInfoVo.getMaxErpModifyDate())? + mesPurchaseOrderMapper.selectMaxErpModifyDate():erpSyncInfoVo.getMaxErpModifyDate(); + return syncPurchaseOrderFromErp(startRow, maxErpModifyDate); } /** * @throws Exception * @Descrption:从金蝶ERP同步采购订单 */ - public int syncPurchaseOrderFromErp(int startRow,String maxErpModifyDate) throws Exception { + public int syncPurchaseOrderFromErp(int startRow, String maxErpModifyDate) throws Exception { K3CloudApi api = new K3CloudApi(); // String FDocumentStatus = "C"; JSONObject queryJson = new JSONObject(); @@ -681,7 +688,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { //订单明细id Long fentryId = resultObject.getLong("FPOOrderEntry.FEntryID"); //erp物料ID - Long fmaterialId = resultObject.getLong("FMaterialId"); + Long fmaterialId = resultObject.getLong("FMaterialId"); //物料编码 String materialCode = resultObject.getString("FMaterialId.FNumber"); //物料名称 @@ -772,12 +779,12 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } } - System.out.println("size:"+resultArray.size()); + System.out.println("size:" + resultArray.size()); /**分页递归获取所有物料信息*/ if (resultArray.size() == limit) { // System.out.println(startRow); //通过递归同步所有物料信息,测试先不用 - int i = syncPurchaseOrderFromErp(startRow + resultArray.size(),maxErpModifyDate); + int i = syncPurchaseOrderFromErp(startRow + resultArray.size(), maxErpModifyDate); // return i; return 1; } else { @@ -788,7 +795,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { public static void main(String[] args) throws Exception { KingdeeErpSyncServiceImpl k = new KingdeeErpSyncServiceImpl(); - k.syncProjectInfoFromErp(0,""); + k.syncProjectInfoFromErp(0, ""); // int i = syncSupplierInfoFromErp(0); // syncMaterialInfoFromErpTest(0); // syncSaleOrderFromErp(); @@ -804,9 +811,6 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } - - - public static int syncMaterialInfoFromErpTest(int startRow) throws Exception { K3CloudApi api = new K3CloudApi(); String FDocumentStatus = "C"; @@ -829,8 +833,8 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { queryJson.put("SubSystemId", ""); //条件查询 - String filterString = "FNumber ='01010001'"; - queryJson.put("FilterString", filterString); + String filterString = "FNumber ='01010001'"; + queryJson.put("FilterString", filterString); System.out.println(queryJson.toString()); @@ -846,7 +850,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { System.out.println("物料单据查询接口: " + result); -return 1; + return 1; } } diff --git a/hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesSaleOrderMapper.xml b/hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesSaleOrderMapper.xml index 28d98fa..184ee9c 100644 --- a/hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesSaleOrderMapper.xml +++ b/hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesSaleOrderMapper.xml @@ -21,6 +21,7 @@ + @@ -54,6 +55,7 @@ material_id, material_code, material_name, + material_model, matkl, order_amount, complete_amount, @@ -136,6 +138,7 @@ material_id, material_code, material_name, + material_model, matkl, order_amount, complete_amount, @@ -171,6 +174,7 @@ #{materialId}, #{materialCode}, #{materialName}, + #{materialModel}, #{matkl}, #{orderAmount}, #{completeAmount}, @@ -210,6 +214,7 @@ material_id = #{materialId}, material_code = #{materialCode}, material_name = #{materialName}, + material_model = #{materialModel}, matkl = #{matkl}, order_amount = #{orderAmount}, complete_amount = #{completeAmount}, diff --git a/hw-modules/hw-job/src/main/java/com/hw/job/task/RyTask.java b/hw-modules/hw-job/src/main/java/com/hw/job/task/RyTask.java index 8b31ff7..b9706e5 100644 --- a/hw-modules/hw-job/src/main/java/com/hw/job/task/RyTask.java +++ b/hw-modules/hw-job/src/main/java/com/hw/job/task/RyTask.java @@ -68,9 +68,11 @@ public class RyTask System.out.println("++创建保养工单++getDmsMaintInstance"); remoteDmsService.getDmsBillsMaintInstance(SecurityConstants.INNER,planMaintCode); } - public void syncSupplierInfoFromErp(){ + public void syncSupplierInfoFromErp(String maxErpModifyDate){ + ErpSyncInfoVo erpSyncInfoVo = new ErpSyncInfoVo(); + erpSyncInfoVo.setMaxErpModifyDate(maxErpModifyDate); System.out.println("++同步ERP中物料供应商++ErpSupplierInfo"); - remoteJindieService.syncSupplierInfoFromErp(SecurityConstants.INNER); + remoteJindieService.syncSupplierInfoFromErp(erpSyncInfoVo,SecurityConstants.INNER); } public void syncMaterialInfoFromErp(String maxErpModifyDate){ ErpSyncInfoVo erpSyncInfoVo = new ErpSyncInfoVo(); @@ -79,19 +81,25 @@ public class RyTask remoteJindieService.syncMaterialInfoFromErp(erpSyncInfoVo,SecurityConstants.INNER); } - public void syncProjectInfoFromErp(){ + public void syncProjectInfoFromErp(String maxErpModifyDate){ + ErpSyncInfoVo erpSyncInfoVo = new ErpSyncInfoVo(); + erpSyncInfoVo.setMaxErpModifyDate(maxErpModifyDate); System.out.println("++同步ERP中项目信息++ErpProjectInfo"); - remoteJindieService.syncProjectInfoFromErp(SecurityConstants.INNER); + remoteJindieService.syncProjectInfoFromErp(erpSyncInfoVo,SecurityConstants.INNER); } - public void syncSaleOrderFromErp(){ + public void syncSaleOrderFromErp(String maxErpModifyDate){ + ErpSyncInfoVo erpSyncInfoVo = new ErpSyncInfoVo(); + erpSyncInfoVo.setMaxErpModifyDate(maxErpModifyDate); System.out.println("++同步ERP中销售订单信息++ErpSaleOrder"); - remoteJindieService.syncSaleOrderFromErp(SecurityConstants.INNER); + remoteJindieService.syncSaleOrderFromErp(erpSyncInfoVo,SecurityConstants.INNER); } - public void syncPurchaseOrderFromErp(){ + public void syncPurchaseOrderFromErp(String maxErpModifyDate){ + ErpSyncInfoVo erpSyncInfoVo = new ErpSyncInfoVo(); + erpSyncInfoVo.setMaxErpModifyDate(maxErpModifyDate); System.out.println("++同步ERP中采购订单信息++ErpPurchaseOrder"); - remoteJindieService.syncPurchaseOrderFromErp(SecurityConstants.INNER); + remoteJindieService.syncPurchaseOrderFromErp(erpSyncInfoVo,SecurityConstants.INNER); } }