diff --git a/api-admin/pom.xml b/api-admin/pom.xml index 68397dd..26915f1 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -286,11 +286,6 @@ 2.1.7 - - org.olap4j - olap4j - 1.2.0 - diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java index 1f28ee2..d495214 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java @@ -106,10 +106,11 @@ public class CorpExportLogController { //往来单位导出生成Excel，并创建生成记录 @PostMapping("/udiwms/corps/importLog/export") public BaseResponse excelDownload(@RequestBody CorpsExportRequest corpsExportRequest) { - String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".xls"; + CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity(); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息" + genKey + ".xls"; corpExportLogEntity.setGenKey(genKey); corpExportLogEntity.setFilePath(fileName); corpExportLogEntity.setUpdateTime(new Date()); @@ -134,7 +135,7 @@ public class CorpExportLogController { basicGenExcelService.uploadCorpSmp(genKey, corpsExportRequest); return ResultVOUtils.success("后台正在上传，请稍后刷新查看!"); } - + //往来单位接口下载（第三方使用） @GetMapping("/udiwms/basic/corps/download") public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, @@ -150,7 +151,6 @@ public class CorpExportLogController { pageSimpleResponse.setList(basicUnitMaintainEntities); return ResultVOUtils.success(pageSimpleResponse); } - } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java index a4c7e12..bb5dadf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java @@ -112,10 +112,11 @@ public class UdiInfoExportLogController { @PostMapping("/udiwms/products/importLog/export") public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { - String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls"; + UdiInfoExportLogEntity udiInfoExportLogEntity = new UdiInfoExportLogEntity(); udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "器械信息" + genKey + ".xls"; udiInfoExportLogEntity.setGenKey(genKey); udiInfoExportLogEntity.setFilePath(fileName); udiInfoExportLogEntity.setUpdateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index ea14c9e..ef86139 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -652,6 +652,26 @@ public class UdiRelevanceController { udiRelevanceEntity.setThirdId4(combineRequest.getThirdId()); udiRelevanceEntity.setThirdName4(combineRequest.getErpName()); } + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4()); + } + if (combineRequest.getErpProductsResponse() != null) { udiRelevanceEntity.setMeasname(combineRequest.getErpProductsResponse().getMeasname()); udiRelevanceEntity.setManufactory(combineRequest.getErpProductsResponse().getManufactory()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java index 3e07339..b60ed97 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java @@ -123,7 +123,11 @@ public class ThrOrderExportLogController { public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { - String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".xls"; + + ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity(); + udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + genKey + ".xls"; File file = new File(fileName); if (!file.exists()) { try { @@ -132,9 +136,6 @@ public class ThrOrderExportLogController { e.printStackTrace(); } } - ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity(); - udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); - String genKey = CustomUtil.getId(); udiInfoExportLogEntity.setGenKey(genKey); udiInfoExportLogEntity.setFilePath(fileName); udiInfoExportLogEntity.setUpdateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java index e9b1677..237bc93 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java @@ -117,7 +117,11 @@ public class ThrProductsExportLogController { @PostMapping("/udiwms/thrProducts/importLog/export") public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { - String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls"; + + ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + genKey + ".xls"; File file = new File(fileName); if (!file.exists()) { try { @@ -126,9 +130,6 @@ public class ThrProductsExportLogController { e.printStackTrace(); } } - ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); - thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); - String genKey = CustomUtil.getId(); thrProductsExportLogEntity.setGenKey(genKey); thrProductsExportLogEntity.setFilePath(fileName); thrProductsExportLogEntity.setUpdateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java index 1f849c2..b65e528 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java @@ -25,5 +25,8 @@ public class UdiRelevanceEntity { private String sptm; private Boolean isDisable; private Boolean isLock; + private String mainId; + private String mainName; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java index 8488d9f..3a20cdc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java @@ -12,4 +12,7 @@ public class PostThrOrderRequest { private String thirdSys; private List datas; + + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 015b606..24fe830 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -51,7 +51,8 @@ public class UdiRelevanceResponse { private Integer productType; private Boolean isSelect; private Boolean isLock; - + private String mainId; + private String mainName; public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index bdfe192..f11dce2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -102,7 +102,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setId(id); List data = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest); - if (data != null) + if (data != null && data.size() > 0) return data.get(0); return null; } @@ -203,6 +203,24 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { @Override public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4()); + } return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index ada0a71..ef83f3d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.thread; import com.glxp.sale.admin.constant.ConstantStatus; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; @@ -10,6 +11,7 @@ import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.ErpProductsResponse; +import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.param.SystemParamConfigService; @@ -37,7 +39,8 @@ public class BasicBackUpdateProductService { ThrProductsService thrProductsService; @Resource SystemParamConfigService systemParamConfigService; - + @Resource + BasicThirdSysService basicThirdSysService; //定时或一键下载更新全部线上产品信息 @Async @@ -105,6 +108,25 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdId4(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdName4(invmandocResponse.getName()); } + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); + } + udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdName(invmandocResponse.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); @@ -150,7 +172,7 @@ public class BasicBackUpdateProductService { if (thrProductsEntities != null && thrProductsEntities.size() > 0) { for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), thirdSysId); - if (udiRelevanceEntity == null){ + if (udiRelevanceEntity == null) { if (isUpdate.getParamValue().equals("1")) { UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); @@ -185,6 +207,27 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdName4(thrProductsEntity.getName()); } + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); + } + + udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); @@ -199,6 +242,4 @@ public class BasicBackUpdateProductService { } - - } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java index dcdb7db..f24b559 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java @@ -129,7 +129,7 @@ public class BasicUdiInfoImportService { udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } } else { - if (mainId == null) {//只存在UDI + if (mainId == null || "".equals(mainId)) {//只存在UDI UdiRelevanceEntity temp = udiRelevanceService.selectUpdateByUuid(udiInfoEntity.getUuid()); if (temp != null && (temp.getThirdId() != null || temp.getThirdId1() != null || temp.getThirdId2() != null || @@ -138,6 +138,12 @@ public class BasicUdiInfoImportService { udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + } else if (temp == null) { + temp = new UdiRelevanceEntity(); + temp.setUuid(udiInfoEntity.getUuid()); + udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); + temp.setUpdateTime(DateUtil.formatDateTime(new Date())); + udiRelevanceService.insertUdiRelevance(temp); } else { udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); udiInfoImportDetailEntity.setRemark("UDI已存在并且未关联不能重复插入！"); @@ -150,22 +156,22 @@ public class BasicUdiInfoImportService { udiRelevanceService.updateUdiRelevance(temp); } else { UdiRelevanceEntity mTemp = udiRelevanceService.selectUpdateByThirdId(mainId); - if(mTemp!=null){ + if (mTemp != null) { udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); udiInfoImportDetailEntity.setRemark("产品编码已存在关联不能重复插入！"); udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - }else { + } else { UdiRelevanceEntity mTemp2 = udiRelevanceService.selectUpdateByUuid(udiInfoEntity.getUuid()); - if(mTemp2!=null && (mTemp2.getThirdId() != null || mTemp2.getThirdId1() != null || mTemp2.getThirdId2() != null || - mTemp2.getThirdId3() != null || mTemp2.getThirdId4() != null)){ + if (mTemp2 != null && (mTemp2.getThirdId() != null || mTemp2.getThirdId1() != null || mTemp2.getThirdId2() != null || + mTemp2.getThirdId3() != null || mTemp2.getThirdId4() != null)) { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); - updateValue(udiRelevanceEntity,udiInfoImportDetailEntity,udiInfoImportLogEntity,mainId); + updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - }else { + } else { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); - updateValue(udiRelevanceEntity,udiInfoImportDetailEntity,udiInfoImportLogEntity,mainId); + updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } @@ -202,6 +208,8 @@ public class BasicUdiInfoImportService { if (mainId != null && udiInfoImportDetailEntity.getThirdId().equals(mainId)) { udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory()); udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); + udiRelevanceEntity.setMainId(mainId); + udiRelevanceEntity.setMainName(thrProductsEntity.getName()); } udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity.setThirdId(udiInfoImportDetailEntity.getThirdId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java index f0ca41a..c108043 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; @@ -16,6 +17,7 @@ import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.ErpProductsResponse; import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.param.SystemParamConfigService; @@ -52,7 +54,8 @@ public class BasicUpdateProductService { SystemParamConfigService systemParamConfigService; @Resource BasicThirdSysDetailService basicThirdSysDetailService; - + @Resource + BasicThirdSysService basicThirdSysService; public String addProduct(CombineRequest combineRequest, String url) { String errMsg = null; @@ -87,6 +90,26 @@ public class BasicUpdateProductService { udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setDiType(1); udiInfoService.insertUdiInfo(udiInfoEntity); + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); + } + udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setThirdName(erpProductsResponse.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); @@ -132,6 +155,25 @@ public class BasicUpdateProductService { udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); + } udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); } } @@ -210,7 +252,7 @@ public class BasicUpdateProductService { paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh()); paramMap.put("uuid", productInfoFilterRequest.getUuid()); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterAllUdi", paramMap); try { BaseResponse> udiDlDeviceResponse = diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 7f7de7a..c488f15 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -224,10 +224,19 @@ public class IoTransInoutService { List temps = codesTempService.findByOrderId(tempQuery); //todo 改成等待校验，选择校验 - genOrderDetail(insertList); -// new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); - orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); + String action = orderEntity.getAction(); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(action); + if (bussinessTypeEntity.getLocalAction() == null || "".equals(bussinessTypeEntity.getAction())) { + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); + invProductsTrService.genInvProducts(orderEntity.getId()); + printOrder(orderEntity.getId()); + } else { + genOrderDetail(insertList); + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); + } checkMutiDi(orderEntity.getId()); +// new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); + // if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) { // orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); // } else { diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 22282e1..a1dd855 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -23,7 +23,7 @@ server.max-http-header-size=100MB spring.servlet.multipart.max-file-size=104857600 spring.servlet.multipart.max-request-size=104857600 server.connectionTimeout =180000 - +logging.level.com.glxp.sale.admin.dao=debug # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002 diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jasper b/api-admin/src/main/resources/jaspers/order_print_1.jasper index fd5ae4a..dff81ea 100644 Binary files a/api-admin/src/main/resources/jaspers/order_print_1.jasper and b/api-admin/src/main/resources/jaspers/order_print_1.jasper differ diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jrxml b/api-admin/src/main/resources/jaspers/order_print_1.jrxml index 2b77567..14a69d0 100644 --- a/api-admin/src/main/resources/jaspers/order_print_1.jrxml +++ b/api-admin/src/main/resources/jaspers/order_print_1.jrxml @@ -163,16 +163,16 @@ - + - + - + @@ -203,14 +203,14 @@ - + - + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index c5e586d..6526d3a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -63,7 +63,12 @@ basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.isLock, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.manufactory,basic_udirel.measname, - basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType + basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, + basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj, + basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb, + basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, + basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, basic_udirel.mainId,basic_udirel.mainName FROM basic_products right JOIN basic_udirel ON basic_products.uuid = basic_udirel.uuid @@ -205,6 +210,7 @@ ( thirdId,thirdName,uuid,isUseDy,updateTime, thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock + ,mainId,mainName ) values ( @@ -226,7 +232,7 @@ #{ybbm}, #{sptm}, #{isDisable}, - #{isLock} + #{isLock}, #{mainId},#{mainName} ) @@ -270,6 +276,8 @@ updateTime=#{updateTime}, isDisable=#{isDisable}, isLock=#{isLock}, + mainId=#{mainId}, + mainName=#{mainName}, WHERE id = #{id}