diff --git a/api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java b/api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java index 93f7db2b..02852957 100644 --- a/api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java +++ b/api-admin/src/main/java/com/glxp/api/ToolApplicationContextInitializer.java @@ -1,7 +1,5 @@ package com.glxp.api; -import com.glxp.api.admin.util.HardWareUtils; -import com.glxp.api.admin.util.MyHardWareUtils; import com.glxp.api.admin.util.RsaUtils; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java index 5162aac3..f4264457 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java @@ -1,20 +1,22 @@ package com.glxp.api.admin.controller.basic; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BasicThirdSysResponse; import com.glxp.api.admin.res.inout.WarehouseResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.basic.UnitMaintainService; +import com.glxp.api.admin.service.basic.*; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -47,6 +49,14 @@ public class BasicThirdSysController { @Resource SystemParamConfigService systemParamConfigService; + @Resource + BasicThirdSysBusApiService basicThirdSysBusApiService; + @Resource + ErpBasicClient erpBasicClient; + @Resource + private BussinessOriginTypeService bussinessOriginTypeService; + + @GetMapping("/udiwms/basic/thirdsys/filter") public BaseResponse filter(FilterBasicThirdSysRequest filterBasicThirdSysRequest, BindingResult bindingResult) { @@ -55,23 +65,8 @@ public class BasicThirdSysController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicThirdSysEntities; -// if (filterBasicThirdSysRequest.getFilter() != null && filterBasicThirdSysRequest.getFilter()) { -// -// SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys"); -// if (thirdSys != null) { -// filterBasicThirdSysRequest.setThirdId(thirdSys.getParamValue()); -// filterBasicThirdSysRequest.setMainSys(null); -// } -// } basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest); -// if (filterBasicThirdSysRequest.getIsBuType() != null && filterBasicThirdSysRequest.getIsBuType()) { -// BasicThirdSysEntity basicThirdSysEntity = new BasicThirdSysEntity(); -// basicThirdSysEntity.setThirdId("local"); -// basicThirdSysEntity.setThirdName("本地系统"); -// basicThirdSysEntities.add(basicThirdSysEntity); -// -// } PageInfo pageInfo; pageInfo = new PageInfo<>(basicThirdSysEntities); @@ -197,4 +192,56 @@ public class BasicThirdSysController { } return ResultVOUtils.success("更新成功"); } + + + @GetMapping("/udiwms/basic/thirdsys/filterBusTypeDetail") + public BaseResponse filterBusTypeDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicThirdSysEntities = new ArrayList<>(); + BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); + bussinessOriginTypeFilterRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk()); + List bussinessOriginTypeEntities = bussinessOriginTypeService.filterList(bussinessOriginTypeFilterRequest); + if (CollUtil.isNotEmpty(bussinessOriginTypeEntities)) { + for (BussinessOriginTypeEntity bussinessOriginTypeEntity : bussinessOriginTypeEntities) { + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = new BasicThirdSysBusApiEntity(); + basicThirdSysBusApiEntity.setThirdSys(bussinessOriginTypeEntity.getThirdSys()); + basicThirdSysBusApiEntity.setCode(bussinessOriginTypeEntity.getAction()); + basicThirdSysBusApiEntity.setName(bussinessOriginTypeEntity.getName()); + basicThirdSysBusApiEntity.setType(filterBasicThirdSysDetailRequest.getType()); + + basicThirdSysBusApiService.insertSysBusApi(basicThirdSysBusApiEntity); + } + basicThirdSysEntities = basicThirdSysBusApiService.filterSysBusApi(filterBasicThirdSysDetailRequest); + } + + + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicThirdSysEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicThirdSysEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/basic/thirdsys/saveBusTypeDetail") + public BaseResponse saveBusTypeDetail(@RequestBody @Valid BasicThirdSysBusApiEntity basicThirdSysBusApiEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (basicThirdSysBusApiEntity != null) { + basicThirdSysBusApiService.updateSysBusApi(basicThirdSysBusApiEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index 7a696afa..3bfc2915 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -370,7 +370,7 @@ public class BasicUnitMaintainController { if (basicThirdSysDetailEntity.getEnabled()) { if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) { BaseResponse> udiDlDeviceResponse = - erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue()); + erpBasicClient.getErpCrop(unitMaintainFilterRequest); if (udiDlDeviceResponse.getCode() == 20000) { for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java index 31344bf9..ed42369c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java @@ -1,12 +1,18 @@ package com.glxp.api.admin.controller.basic; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BussinessOriginTypeService; import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; @@ -19,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.Date; import java.util.List; @RestController @@ -27,6 +35,10 @@ public class BussinessOriginTypeController { @Resource private BussinessOriginTypeService bussinessOriginTypeService; + @Resource + ErpBasicClient erpBasicClient; + @Resource + private BasicThirdSysDetailService basicThirdSysDetailService; @AuthRuleAnnotation("") @GetMapping("/udiwms/originBusType/filter") @@ -98,5 +110,31 @@ public class BussinessOriginTypeController { return ResultVOUtils.success("更新成功"); } + @PostMapping("/udiwms/originBusType/download") + public BaseResponse dlBusType(@RequestBody @Valid BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest = new FilterBasicThirdSysDetailRequest(); + filterBasicThirdSysDetailRequest.setThirdSysFk(bussinessOriginTypeFilterRequest.getThirdSys()); + BaseResponse> baseResponse = erpBasicClient.getBusTypes(filterBasicThirdSysDetailRequest); + if (baseResponse != null && baseResponse.getCode() == 20000) { + List basicThirdSysBusApiEntities = baseResponse.getData(); + if (CollUtil.isNotEmpty(basicThirdSysBusApiEntities)) { + for (BasicThirdSysBusApiEntity basicThirdSysBusApiEntity : basicThirdSysBusApiEntities) { + BussinessOriginTypeEntity bussinessOriginTypeEntity = new BussinessOriginTypeEntity(); + bussinessOriginTypeEntity.setName(basicThirdSysBusApiEntity.getName()); + bussinessOriginTypeEntity.setAction(basicThirdSysBusApiEntity.getCode()); + bussinessOriginTypeEntity.setThirdSys(bussinessOriginTypeFilterRequest.getThirdSys()); + bussinessOriginTypeEntity.setEnable(true); + bussinessOriginTypeEntity.setUpdateTime(new Date()); + bussinessOriginTypeService.insertBusOriginType(bussinessOriginTypeEntity); + } + } + } + return ResultVOUtils.success("下载成功"); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index 8a348b4e..ef7f0b4e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -154,7 +154,7 @@ public class UdiInfoController { if (basicThirdSysDetailEntity.getEnabled()) { if (basicThirdSysDetailEntity.getFromType() == 0 || (filterErpGoodsRequest.getIsDownThrSys() != null && filterErpGoodsRequest.getIsDownThrSys())) { - BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue()); + BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest); if (udiDlDeviceResponse.getCode() == 20000) { List invmandocResponses = udiDlDeviceResponse.getData().getList(); if (invmandocResponses != null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 80642e15..44e873a5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -441,7 +441,10 @@ public class OrderController { mainOrderEntity.setErpFk(docidStr); mainOrderEntity.setUpdateTime(new Date()); orderService.updateOrder(mainOrderEntity); -// ioTransInoutService.transStatus(mainOrderEntity.getId()); + if (orderMergeRequest.getType() == 1) { + ioTransInoutService.transStatus(mainOrderEntity.getId()); + } + } else { return ResultVOUtils.error(ResultEnum.DATA_ERROR); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java index bc816b58..772f6d6f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.inventory; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -384,7 +385,7 @@ public class InvWarehouseController { String json = FileUtils.readStream(inputStream); InvWarehouseExportResponse invWarehouseExportResponse = (InvWarehouseExportResponse) JSON.parseObject(json, InvWarehouseExportResponse.class); List invWarehouseEntities = invWarehouseExportResponse.getInvWarehouseEntities(); - if (invWarehouseEntities != null) { + if (CollUtil.isNotEmpty(invWarehouseEntities)) { invWarehouseService.importInvWarehouse(invWarehouseEntities); } List thrInvWarehouseEntities = invWarehouseExportResponse.getThrInvWarehouseEntities(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java index 7f93bce9..b949705b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java @@ -193,7 +193,7 @@ public class ThrCorpExportLogController { if (basicThirdSysDetailEntity.getEnabled()) { if (basicThirdSysDetailEntity.getFromType() == 0) { BaseResponse> udiDlDeviceResponse = - erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue()); + erpBasicClient.getErpCrop(unitMaintainFilterRequest); return udiDlDeviceResponse; } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java index 74130777..a3cd2ce1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java @@ -184,7 +184,7 @@ public class ThrOrderExportLogController { } if (basicThirdSysDetailEntity.getFromType() != null && basicThirdSysDetailEntity.getFromType() == 0) { - return erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest); + return erpOrderClient.getErpOrderResponse(filterErpOrderRequest); } else { //todo 订单查询，需加日期 FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java index fcda08d4..6a73fc7d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java @@ -171,9 +171,9 @@ public class ThrProductsExportLogController { if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); if (basicThirdSysDetailEntity.getEnabled()) { - if (basicThirdSysDetailEntity.getFromType() == 0 ) { + if (basicThirdSysDetailEntity.getFromType() == 0) { ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); - BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue()); + BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest); if (udiDlDeviceResponse.getCode() == 20000) { return udiDlDeviceResponse; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java new file mode 100644 index 00000000..cb6e8af1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BasicThirdSysBusApiDao { + boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); + + boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); + + List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysBusApiEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysBusApiEntity.java new file mode 100644 index 00000000..a2a35e22 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysBusApiEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class BasicThirdSysBusApiEntity { + + private Integer id; + private String code; + private String name; + private String thirdSys; + private String url; + private Integer type; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 65246daa..905b690a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -32,6 +32,7 @@ public class UdiRelevanceEntity { private Boolean isAdavence; private String supName; private String originUuid; + private boolean allowNoBatch; public Integer getLockStatus() { if (lockStatus == null) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java index b4c21a3f..27f7d88f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java @@ -35,5 +35,6 @@ public class StockOrderDetailEntity { //开票日期 private String invoiceDate; private String manufactory; + private boolean allowNoBatch; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java index 5023ed2d..d9a78cc2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -2,9 +2,12 @@ package com.glxp.api.admin.httpclient; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.httpclient.req.UdiwmsBusTypeRequest; import com.glxp.api.admin.httpclient.req.UdiwmsUnitRequest; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; @@ -18,7 +21,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -28,25 +33,18 @@ import java.util.Map; @Service public class ErpBasicClient { - @Autowired + @Resource private BasicThirdSysService basicThirdSysService; //获取往来单位 - public BaseResponse> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) { - Map paramMap = new HashMap<>(16); - paramMap.put("name", unitMaintainFilterRequest.getName()); - paramMap.put("unitId", unitMaintainFilterRequest.getErpId()); - paramMap.put("key", unitMaintainFilterRequest.getKey()); - paramMap.put("page", unitMaintainFilterRequest.getPage()); - paramMap.put("limit", unitMaintainFilterRequest.getLimit()); + public BaseResponse> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest) { UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); BeanUtils.copyProperties(unitMaintainFilterRequest, udiwmsUnitRequest); udiwmsUnitRequest.setUnitId(unitMaintainFilterRequest.getErpId()); - - //查询第三方系统授权参数 - basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys()); - String response = HttpClient.uCloudPost(url, udiwmsUnitRequest); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getUnits"; + String response = HttpClient.uCloudPost(url, udiwmsUnitRequest, basicThirdSysEntity); try { BaseResponse> udiDlDeviceResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -59,18 +57,10 @@ public class ErpBasicClient { } //获取产品信息 - public BaseResponse> getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, String url) { - Map paramMap = new HashMap<>(16); - paramMap.put("code", filterErpGoodsRequest.getCode()); - paramMap.put("name", filterErpGoodsRequest.getName()); - paramMap.put("spec", filterErpGoodsRequest.getSpec()); - paramMap.put("registerNo", filterErpGoodsRequest.getRegisterNo()); - paramMap.put("manufactory", filterErpGoodsRequest.getManufactory()); - paramMap.put("limit", filterErpGoodsRequest.getLimit()); - paramMap.put("page", filterErpGoodsRequest.getPage()); + public BaseResponse> getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest) { - //查询第三方服务授权参数 BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getProducts"; String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity); try { BaseResponse> udiDlDeviceResponse = @@ -83,5 +73,25 @@ public class ErpBasicClient { } } + //获取单据类型 + public BaseResponse> getBusTypes(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterBasicThirdSysDetailRequest.getThirdSysFk()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getOrderType"; + UdiwmsBusTypeRequest udiwmsBusTypeRequest = new UdiwmsBusTypeRequest(); + udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk()); + udiwmsBusTypeRequest.setPage(1); + udiwmsBusTypeRequest.setLimit(100); + String response = HttpClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity); + log.info(response); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return udiDlDeviceResponse; + } catch (Exception e) { + log.error("获取单据类型异常", e); + return ResultVOUtils.error(500, "连接ERP服务出错！"); + } + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java index ff6a3b2d..4f899e0d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.httpclient.req.UdiwmsOrderRequest; import com.glxp.api.admin.req.inout.ERPPostBillRequest; import com.glxp.api.admin.req.inout.FilterOrderRequest; import com.glxp.api.admin.req.inout.USignRequest; @@ -43,27 +44,11 @@ public class ErpOrderClient { return erpOrderEntities; } - public BaseResponse> getErpOrderResponse(String url, FilterOrderRequest filterOrderRequest) { - Map paramMap = new HashMap<>(16); - paramMap.put("billNo", filterOrderRequest.getBillNo()); - paramMap.put("page", filterOrderRequest.getPage()); - paramMap.put("limit", filterOrderRequest.getLimit()); - paramMap.put("billAction", filterOrderRequest.getBillAction()); - paramMap.put("billFlag", filterOrderRequest.getBillFlag()); - paramMap.put("corpName", filterOrderRequest.getCorpName()); - if (filterOrderRequest.getStartDate() == null || filterOrderRequest.getEndDate() == null) { - Map date = DateUtil.getDayTRange(); - if (filterOrderRequest.getBillNo() != null) { - date = DateUtil.getYearTRange(); - } - filterOrderRequest.setStartDate((String) date.get("startDate")); - filterOrderRequest.setEndDate((String) date.get("endDate")); - } - paramMap.put("startDate", filterOrderRequest.getStartDate()); - paramMap.put("endDate", filterOrderRequest.getEndDate()); + public BaseResponse> getErpOrderResponse(FilterOrderRequest filterOrderRequest) { //查询第三方服务授权参数 BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterOrderRequest.getThirdOrderFk()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getUnits"; String response = HttpClient.uCloudPost(url, filterOrderRequest, basicThirdSysEntity); try { BaseResponse> responseBaseResponse = @@ -76,10 +61,9 @@ public class ErpOrderClient { return null; } - public List getErpOrder(String url, FilterOrderRequest filterOrderRequest) { - + public List getErpOrder(FilterOrderRequest filterOrderRequest) { try { - BaseResponse> responseBaseResponse = getErpOrderResponse(url, filterOrderRequest); + BaseResponse> responseBaseResponse = getErpOrderResponse(filterOrderRequest); List purchaseinResponseList = responseBaseResponse.getData().getList(); if (purchaseinResponseList != null && purchaseinResponseList.size() > 0) { List erpOrderEntities = new ArrayList<>(); @@ -112,16 +96,23 @@ public class ErpOrderClient { return null; } - public List getErpOrder(String billCode, String action) { - FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); - filterOrderRequest.setPage(1); - filterOrderRequest.setLimit(1); - filterOrderRequest.setBillAction(action); - filterOrderRequest.setBillNo(billCode); - List erpOrderEntities = getErpOrder(null, filterOrderRequest); - return erpOrderEntities; + + public BaseResponse submitOrder(UdiwmsOrderRequest udiwmsOrderRequest) { + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsOrderRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/submitOrders"; + String response = HttpClient.uCloudPost(url, udiwmsOrderRequest, basicThirdSysEntity); + try { + BaseResponse> responseBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return responseBaseResponse; + } catch (Exception e) { + log.error("获取订单数据异常", e); + } + return null; } + public BaseResponse postBill(Map> postMap, String billAction, String uploadUrl, String thirdSysFk) { ERPPostBillRequest erpPostBillRequest = new ERPPostBillRequest(); erpPostBillRequest.setPostMap(postMap); diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SmpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SmpClient.java deleted file mode 100644 index fad491cb..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SmpClient.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.glxp.api.admin.httpclient; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; - -public class SmpClient { - - public void uploadCorp(){ - - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java index bc764964..ddf0b2c7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UHttpClient.java @@ -23,7 +23,7 @@ public class UHttpClient { public static String post(String url, Object object) { SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); factory.setConnectTimeout(600000); - factory.setReadTimeout(100000); + factory.setReadTimeout(600000); RestTemplate restTemplate = new RestTemplate(); String json = JSONObject.toJSON(object).toString(); MultiValueMap postParameters = new LinkedMultiValueMap<>(); @@ -40,7 +40,7 @@ public class UHttpClient { public static String postJson(String url, Object object) { SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); factory.setConnectTimeout(600000); - factory.setReadTimeout(20000); + factory.setReadTimeout(600000); RestTemplate restTemplate = new RestTemplate(factory); String json = JSONObject.toJSON(object).toString(); logger.info(url + "\n" + json); diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsBusTypeRequest.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsBusTypeRequest.java new file mode 100644 index 00000000..dda2e5bc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsBusTypeRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.httpclient.req; + +import lombok.Data; + +@Data +public class UdiwmsBusTypeRequest { + + private String id; + private String code; + private String name; + private Integer limit; + private Integer page; + private String thirdSys; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderDetail.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderDetail.java new file mode 100644 index 00000000..8998ccc0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderDetail.java @@ -0,0 +1,26 @@ +package com.glxp.api.admin.httpclient.req; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class UdiwmsOrderDetail { + + private String productId; //产品编码 + private BigDecimal price; //单价 + private String batchNo; //批次号 + private String expireDate; //失效日期 + private String productDate; //生产日期 + private String standard; //规格型号 + private String productName; //产品名称 + private Integer count; //数量 + private Integer reCount; //数量 + private String remark; //备注 + private String remark1; //备注1/规格型号ID + private String remark2; //备注2/型号 + private String remark3; //备注3/规格 + + //阳光采购平台 耗材目录规格id + private String productSpecId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderRequest.java new file mode 100644 index 00000000..a3e74ea4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/req/UdiwmsOrderRequest.java @@ -0,0 +1,41 @@ +package com.glxp.api.admin.httpclient.req; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +public class UdiwmsOrderRequest { + + private String startDate; //起始日期 + private String endDate; //结束日期 + private String billNo; //单据号 + private String billFlag; //单据状态,0.未签字，1.已签字 + private String billAction; + private String action; + private Integer limit; + private Integer page; + private Integer inoutType; + + + private String billDate; //单据日期 + private String billType; //单据类型 + private Integer createUser; + private Integer reviewUser; + private String remark; //备注 + private String address; //地址 + private String linkMan; //联系人 + private String linkTel; //电话 + private String corpId; //第三方单据往来单位ID + private String corpName; //往来单位 + private String detailCode; //明细编码 + private String thirdSys; //第三方系统ID + private String status; //单据状态 + + + + private List items; //单据详情数组 + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java index d31eed0d..1317fc9b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java @@ -8,4 +8,8 @@ public class FilterBasicThirdSysDetailRequest extends ListPageRequest { private String key; private String thirdSysFk; + + private String code; + private String name; + private Integer type; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 1a3db65f..c313a82c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -66,6 +66,7 @@ public class UdiRelevanceResponse { private String unitFk; private String companyName; private String originUuid; + private boolean allowNoBatch; public int getBhzxxsbzsl() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java index 5692d80f..5777c23d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java @@ -35,4 +35,5 @@ public class StockOrderDetailResponse { //开票日期 private String invoiceDate; + private boolean allowNoBatch; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java new file mode 100644 index 00000000..b4fdace6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; + +import java.util.List; + +public interface BasicThirdSysBusApiService { + + boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); + + boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); + + BasicThirdSysBusApiEntity selectByKey(String key, String thirdSys); + + List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java new file mode 100644 index 00000000..fff1c871 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java @@ -0,0 +1,45 @@ +package com.glxp.api.admin.service.basic.impl; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.admin.service.basic.BasicThirdSysBusApiService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class BasicThirdSysBusApiServiceImpl implements BasicThirdSysBusApiService { + + @Resource + BasicThirdSysBusApiDao basicThirdSysBusApiDao; + + @Override + public boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity) { + return basicThirdSysBusApiDao.insertSysBusApi(basicThirdSysEntity); + } + + @Override + public boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity) { + return basicThirdSysBusApiDao.updateSysBusApi(basicThirdSysEntity); + } + + @Override + public BasicThirdSysBusApiEntity selectByKey(String key, String thirdSys) { + FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest = new FilterBasicThirdSysDetailRequest(); + filterBasicThirdSysDetailRequest.setThirdSysFk(thirdSys); + filterBasicThirdSysDetailRequest.setKey(key); + List basicThirdSysBusApiEntities = basicThirdSysBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest); + if (CollUtil.isNotEmpty(basicThirdSysBusApiEntities)) { + return basicThirdSysBusApiEntities.get(0); + } + return null; + } + + @Override + public List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { + return basicThirdSysBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java index 3e311149..080b207a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java @@ -61,7 +61,7 @@ public class ThrDataService { filterErpGoodsRequest.setCode(code); filterErpGoodsRequest.setPage(1); filterErpGoodsRequest.setLimit(1); - BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue()); + BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest); if (udiDlDeviceResponse.getCode() == 20000) { List erpProductsResponses = udiDlDeviceResponse.getData().getList(); if (erpProductsResponses != null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java index e6de7d7a..2a997ce7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java @@ -71,7 +71,7 @@ public class BasicBackUpdateProductService { public int getAllProducts(FilterErpGoodsRequest filterErpGoodsRequest, String productUrl, String onHandUrl, String thirdSysId, Boolean isEnable) { - BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl); + BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest); List invmandocResponses = erpProducts.getData().getList(); SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type"); if (isEnable == null || isEnable == false) { @@ -358,5 +358,4 @@ public class BasicBackUpdateProductService { } - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java index 002bde1b..d298397f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Locale; import java.util.stream.Collectors; @@ -46,7 +47,7 @@ public class BasicUnitImportService { unitMaintainFilterRequest.setPage(page); unitMaintainFilterRequest.setLimit(100); BaseResponse> baseResponse = - erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue()); + erpBasicClient.getErpCrop(unitMaintainFilterRequest); List temps = baseResponse.getData().getList(); if (temps.size() < 100) { erpUnitsResponses.addAll(temps); @@ -108,6 +109,7 @@ public class BasicUnitImportService { basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP); basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); + basicUnitMaintainEntity.setUpdateTime(new Date()); basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java index fed66751..b6bfde4d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -58,7 +58,6 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { if (isUpdate != null && "1".equals(isUpdate.getParamValue())) { BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); -// SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys"); String thirdSysId = null; if (basicThirdSysEntity != null && basicThirdSysEntity.getThirdId() != null) { thirdSysId = basicThirdSysEntity.getThirdId(); @@ -68,12 +67,12 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSysId); if (piDetailEntity.getFromType() == 0) { if (piDetailEntity.getValue() != null && invPiDetailEntity.getValue() != null) { - updateproductService.addAllProducts(null,piDetailEntity.getValue(), invPiDetailEntity.getValue(), thirdSysId, true); + updateproductService.addAllProducts(null, piDetailEntity.getValue(), invPiDetailEntity.getValue(), thirdSysId, true); } else { logger.info("接口地址未设置"); } } else { - updateproductService.loadLocal(null,thirdSysId, invPiDetailEntity.getValue(), true); + updateproductService.loadLocal(null, thirdSysId, invPiDetailEntity.getValue(), true); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java index 684f2d3d..6e37bbc8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java @@ -61,84 +61,6 @@ public class BasicUpdateProductService { private ErpBasicClient erpBasicClient; - public String addProduct(CombineRequest combineRequest, String url) { - String errMsg = null; - List inventoryCodes = new ArrayList<>(); - if (combineRequest.getThirdIds() == null) - inventoryCodes.add(combineRequest.getThirdId()); - else { - inventoryCodes = combineRequest.getThirdIds(); - } - if (inventoryCodes.size() > 0) { - for (String inventoryCode : inventoryCodes) { - UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setThirdId(inventoryCode); - FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); - filterErpGoodsRequest.setCode(inventoryCode); - filterErpGoodsRequest.setPage(1); - filterErpGoodsRequest.setLimit(1); - filterErpGoodsRequest.setThirdSys(combineRequest.getThirdSys()); - BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, url); - List erpProductsResponses = erpProducts.getData().getList(); - if (erpProductsResponses != null & erpProductsResponses.size() > 0) { - if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) { - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys()); - if (basicThirdSysDetailEntity.getFromType() == 0) { - BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys()); - ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); - erpOnhandRequest.setInventoryCodes(inventoryCodes); - erpOnhandRequest.setFilterCount(2); - List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, inQuery.getValue()); - if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { - ErpInvProductResponse erpInvProductResponse = erpOnHandResponses.get(0); - Map erpProductsMap = new HashMap<>(); - erpProductsMap.put(erpInvProductResponse.getCode(), erpProductsResponses.get(0)); - addRl(erpInvProductResponse, combineRequest.getThirdSys(), erpProductsMap); - } else { - errMsg = "部分未找到库存信息无法添加！"; - } - } else { - FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); - filterThrInvProductsRequest.setInventoryCode(inventoryCode); - filterThrInvProductsRequest.setFilterCount(2); - List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); - if (thrInvProductsEntities != null && thrInvProductsEntities.size() > 0) { - ThrInvProductsEntity thrInvProductsEntity = thrInvProductsEntities.get(0); - Map erpProductsMap = new HashMap<>(); - ErpInvProductResponse erpProductsResponse = new ErpInvProductResponse(); - BeanUtils.copyProperties(thrInvProductsEntity, erpProductsResponse); - erpProductsResponse.setCode(thrInvProductsEntity.getInventoryCode()); - erpProductsResponse.setName(thrInvProductsEntity.getInventoryName()); - erpProductsMap.put(thrInvProductsEntity.getInventoryCode(), erpProductsResponses.get(0)); - addRl(erpProductsResponse, combineRequest.getThirdSys(), erpProductsMap); - } else { - errMsg = "部分未找到库存信息无法添加！"; - } - } - } else { - ErpProductsResponse erpProductsResponse = erpProductsResponses.get(0); - UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - BeanUtils.copyProperties(erpProductsResponse, udiInfoEntity); - udiInfoEntity.setNameCode(erpProductsResponse.getCode()); - udiInfoEntity.setCpmctymc(erpProductsResponse.getName()); - udiInfoEntity.setManufactory(erpProductsResponse.getManufactory()); - udiInfoEntity.setYlqxzcrbarmc(erpProductsResponse.getManufactory()); - udiInfoEntity.setGgxh(erpProductsResponse.getSpec()); - udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo()); - udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); - udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); - udiInfoService.insertUdiInfo(udiInfoEntity); - udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity1.setThirdName(erpProductsResponse.getName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); - } - } - } - } - return errMsg; - } public String addLocalProduct(CombineRequest combineRequest) { String errMsg = null; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index f6f5845e..5a0ccc4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -144,6 +144,11 @@ public class DlBasicService { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); //仓库字典导入 if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) { + + for (InvWarehouseEntity invWarehouseEntity : syncDataResponse.getInvWarehouseEntities()) { + invWarehouseEntity.setUpdateTime(null); + } + invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities()); } @@ -153,6 +158,7 @@ public class DlBasicService { List corpList = syncDataResponse.getUdiRelevanceEntities(); UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { + basicUnitMaintainEntity.setUpdateTime(null); mapper.insertUdiRelevance(basicUnitMaintainEntity); } batchSession.commit(); @@ -165,8 +171,8 @@ public class DlBasicService { try { List corpList = syncDataResponse.getUdiInfoEntities(); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); - for (UdiInfoEntity basicUnitMaintainEntity : corpList) { - mapper.insertUdiInfo(basicUnitMaintainEntity); + for (UdiInfoEntity udiInfoEntity : corpList) { + mapper.insertUdiInfo(udiInfoEntity); } batchSession.commit(); } catch (Exception e) { @@ -180,6 +186,7 @@ public class DlBasicService { List corpList = syncDataResponse.getBasicUnitMaintainEntities(); BasicUnitMaintainDao mapper = batchSession.getMapper(BasicUnitMaintainDao.class); for (BasicUnitMaintainEntity basicUnitMaintainEntity : corpList) { + basicUnitMaintainEntity.setUpdateTime(null); mapper.importBasicUnitMaintain(basicUnitMaintainEntity); } batchSession.commit(); @@ -208,6 +215,7 @@ public class DlBasicService { List thrProductsEntities = syncDataResponse.getThrProductsEntities(); ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { + thrProductsEntity.setUpdateTime(null); mapper.insertThrProducts(thrProductsEntity); } batchSession.commit(); @@ -222,6 +230,7 @@ public class DlBasicService { List thrCorpEntities = syncDataResponse.getThrCorpEntities(); ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class); thrCorpEntities.forEach(thrCorpEntity -> { + thrCorpEntity.setUpdateTime(null); mapper.importThrCorp(thrCorpEntity); }); batchSession.commit(); @@ -235,6 +244,7 @@ public class DlBasicService { List thrOrderEntities = syncDataResponse.getThrOrderEntities(); ThrOrderDao mapper = batchSession.getMapper(ThrOrderDao.class); thrOrderEntities.forEach(thrCorpEntity -> { + thrCorpEntity.setUpdateTime(null); mapper.importThrOrder(thrCorpEntity); }); batchSession.commit(); @@ -282,6 +292,7 @@ public class DlBasicService { List bussinessTypeEntities = syncDataResponse.getBussinessTypeEntities(); BussinessTypeDao mapper = batchSession.getMapper(BussinessTypeDao.class); for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { + bussinessTypeEntity.setUpdateTime(null); mapper.insertBussinessType(bussinessTypeEntity); } batchSession.commit(); @@ -294,6 +305,7 @@ public class DlBasicService { List bussinessLocalTypeEntities = syncDataResponse.getBussinessLocalTypeEntities(); BussinessLocalTypeDao mapper = batchSession.getMapper(BussinessLocalTypeDao.class); for (BussinessLocalTypeEntity bussinessTypeEntity : bussinessLocalTypeEntities) { + bussinessTypeEntity.setUpdateTime(null); mapper.insertBussinessType(bussinessTypeEntity); } batchSession.commit(); @@ -306,6 +318,7 @@ public class DlBasicService { List bussinessTypeEntities = syncDataResponse.getBussinessOriginTypeEntities(); BussinessOriginTypeDao mapper = batchSession.getMapper(BussinessOriginTypeDao.class); for (BussinessOriginTypeEntity bussinessTypeEntity : bussinessTypeEntities) { + bussinessTypeEntity.setUpdateTime(null); mapper.insertBusOriginType(bussinessTypeEntity); } batchSession.commit(); @@ -339,6 +352,7 @@ public class DlBasicService { List orderEntities = syncDataResponse.getOrderEntities(); OrderDao mapper = batchSession.getMapper(OrderDao.class); for (OrderEntity orderEntity : orderEntities) { + orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setReceiveStatus(0); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index 9fa4f5b4..ded0967e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -108,7 +108,6 @@ public class HeartService { } public void uploadAllData() { - //自动创建要求被下载基础信息任务 BasicExportStatusEntity basicExportStatusEntity3 = basicExportService.findByData("AutoUploadAllData", 0); if (basicExportStatusEntity3 == null) { BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java index 8af3c256..925d2b29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java @@ -105,10 +105,7 @@ public class HeartTask implements SchedulingConfigurer { dlUploadService.dlBasicUdiInfo(); redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", curTime); } - } - - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 4265419a..c66cd777 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -436,7 +436,6 @@ public class IoTransInoutService { //转入正式表后，更换单据状态，等待校验或已完成 public void transStatus(String orderId) { - //todo 改成等待校验，选择校验 OrderEntity orderEntity = orderService.findById(orderId); String action = orderEntity.getAction(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java index a71554b1..0b14f63e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java @@ -249,7 +249,7 @@ public class ThrCorpsDlService { basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); basicUnitMaintainFilterRequest.setPage(page); basicUnitMaintainFilterRequest.setLimit(limit); - BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl); + BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest); if (erpCrops == null || erpCrops.getCode() != 20000) { thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); @@ -312,7 +312,7 @@ public class ThrCorpsDlService { basicUnitMaintainFilterRequest.setErpId(thrCorpExportRequest.getUnitId()); basicUnitMaintainFilterRequest.setPage(page); basicUnitMaintainFilterRequest.setLimit(limit); - BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl); + BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest); if (erpCrops.getCode() != 20000) { return null; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java index e758a902..6cfe928a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java @@ -511,7 +511,7 @@ public class ThrOrdersDlService { filterThrOrderRequest.setBillAction(action); FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); - BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(orderUrl, filterOrderRequest); + BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterOrderRequest); if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { List erpOrderResponses = responseBaseResponse.getData().getList(); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { @@ -632,7 +632,7 @@ public class ThrOrdersDlService { BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); filterOrderRequest.setPage(page); filterOrderRequest.setLimit(limit); - BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(orderQueryUrl, filterOrderRequest); + BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterOrderRequest); if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { List erpOrderResponses = responseBaseResponse.getData().getList(); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java index ad5eccf1..eeb9c1e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java @@ -264,10 +264,6 @@ public class ThrProductsDlService { } - - //Todo 接口上传SMP -// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); -// if (systemParamConfigEntity != null) { String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/thrsys/postThrProducts", postThrProductsRequest); BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { }); @@ -276,11 +272,6 @@ public class ThrProductsDlService { } else { thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } -// } else { -// thrProductsExportLogEntity.setRemark("SMP服务IP地址未定义！"); -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// } - thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); } @@ -412,7 +403,7 @@ public class ThrProductsDlService { filterErpGoodsRequest.setPage(page); filterErpGoodsRequest.setLimit(limit); - BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl); + BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest); if (erpProducts != null && erpProducts.getCode() == 20000) { List erpProductsResponses = erpProducts.getData().getList(); if (erpProductsResponses != null && erpProductsResponses.size() > 0) { @@ -472,7 +463,7 @@ public class ThrProductsDlService { BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); filterErpGoodsRequest.setPage(page); filterErpGoodsRequest.setLimit(limit); - BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl); + BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest); if (erpProducts != null && erpProducts.getCode() == 20000) { List erpProductsResponses = erpProducts.getData().getList(); if (erpProductsResponses != null && erpProductsResponses.size() > 0) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index dfc0b2b9..0c96c584 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java @@ -66,6 +66,8 @@ public class UpBasicService { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadAllData"); if (basicExportStatusTimeEntity == null) { basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); } //仓库字典 @@ -124,13 +126,13 @@ public class UpBasicService { } } - //供应商产品信息关联表 - FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); - BeanUtils.copyProperties(basicExportStatusTimeEntity, filterCompanyProductRelevanceRequest); - List companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); +// //供应商产品信息关联表 +// FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); +// BeanUtils.copyProperties(basicExportStatusTimeEntity, filterCompanyProductRelevanceRequest); +// List companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); - syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities); +// syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities); syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); syncDataResponse.setBasicUnitMaintainEntities(basicUnitMaintainEntities); syncDataResponse.setThrCorpEntities(thrCorpEntities); @@ -158,6 +160,7 @@ public class UpBasicService { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadBusType"); if (basicExportStatusTimeEntity == null) { basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); } BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessTypeFilterRequest); @@ -189,6 +192,7 @@ public class UpBasicService { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadOrder"); if (basicExportStatusTimeEntity == null) { basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); } OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); BeanUtils.copyProperties(basicExportStatusTimeEntity, orderFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java index f565357b..7c252146 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/HardWareUtils.java @@ -188,6 +188,6 @@ public class HardWareUtils extends Applet { String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8); System.out.println("加密后:" + msg);//rT7DaHDt68m9IjVr - MyHardWareUtils.getCPUID(); +// MyHardWareUtils.getCPUID(); } } diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index e6041f87..f9841a5a 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -3,8 +3,8 @@ server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root +#spring.datasource.password=Glxp@6066 spring.datasource.password=123456 -#spring.datasource.password=89083fb2fc145533 server.servlet.context-path= #logging.level.com.glxp.api.admin.dao=debug logging.level.com.glxp.api.admin.dao.auth=debug @@ -20,15 +20,15 @@ logging.path=output/logs # 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 #logging.file=D:/udi.log -file_path=D:/1s/udiwms/udiwmsfile/ -#file_path=/home/glxp/udiwms +#file_path=D:/1s/udiwms/udiwmsfile/ +file_path=/home/glxp/udiwms #UDI数据下载 UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs #中转服务IP地址 SPSYNC_IP=http://127.0.0.1:9989 -#SPSYNC_IP=http://192.168.0.109:8080/SP_SYNC_SERVER +#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER #UDI_SERVER_URL=http://127.0.0.1:9995 ##端口号 # Redis数据库索引（默认为0） diff --git a/api-admin/src/main/resources/logback-spring.xml b/api-admin/src/main/resources/logback-spring.xml index daa05617..2dc89920 100644 --- a/api-admin/src/main/resources/logback-spring.xml +++ b/api-admin/src/main/resources/logback-spring.xml @@ -1,8 +1,9 @@ logback - - + + +