diff --git a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java index 5474208..fe71c11 100644 --- a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java @@ -2,12 +2,15 @@ package com.glxp.mipsdl.client.zaxyy; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; @@ -15,40 +18,33 @@ import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthUserDao; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; +import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper; import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao; import com.glxp.mipsdl.dao.basic.BasicCorpDao; -import com.glxp.mipsdl.dao.basic.BasicProductsDao; -import com.glxp.mipsdl.dao.basic.BasicUdirelDao; -import com.glxp.mipsdl.dao.inout.IoCodeDao; -import com.glxp.mipsdl.dao.inout.IoOrderDao; -import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; -import com.glxp.mipsdl.dao.inout.IoOrderUploadLogDao; +import com.glxp.mipsdl.dao.inout.*; import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; -import com.glxp.mipsdl.dao.thrsys.ThrProductsDao; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.auth.AuthUserEntity; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; +import com.glxp.mipsdl.entity.auth.AuthWarehouseUser; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; -import com.glxp.mipsdl.entity.basic.BasicProductsEntity; -import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; -import com.glxp.mipsdl.entity.inout.IoCodeEntity; -import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity; -import com.glxp.mipsdl.entity.inout.IoOrderEntity; -import com.glxp.mipsdl.entity.inout.IoOrderUploadLogEntity; +import com.glxp.mipsdl.entity.basic.BasicCorpEntity; +import com.glxp.mipsdl.entity.inout.*; import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; -import com.glxp.mipsdl.req.post.PostFileThrOrderRequest; -import com.glxp.mipsdl.req.post.PostThrCorpRequest; -import com.glxp.mipsdl.req.post.PostThrInvProductsRequest; -import com.glxp.mipsdl.req.post.PostThrProductsRequest; +import com.glxp.mipsdl.req.ctqyy.CtqPostRelProductRequest; +import com.glxp.mipsdl.req.post.*; import com.glxp.mipsdl.req.zaxyy.ZaZyRequest; import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest; +import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; +import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse; +import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse; import com.glxp.mipsdl.service.auth.AuthWarehouseService; +import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; import com.glxp.mipsdl.util.DateUtil; @@ -66,6 +62,8 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 诏安县医院，智业V1接口对接 @@ -102,17 +100,16 @@ public class ZaxyyClient extends CommonHttpClient { private ThrCorpService thrCorpService; @Resource private IoOrderDetailBizDao orderDetailBizDao; + @Resource + private IoOrderDetailCodeDao orderDetailCodeDao; + + @Resource private IoOrderUploadLogDao orderUploadLogDao; @Resource private SubmitOrderUtil submitOrderUtil; @Resource - private BasicUdirelDao basicUdirelDao; - @Resource - private BasicProductsDao basicProductsDao; - @Resource - private ThrProductsDao thrProductsDao; - + AuthWarehouseUserMapper authWarehouseUserMapper; /** * 拼接xml请求头 @@ -148,7 +145,7 @@ public class ZaxyyClient extends CommonHttpClient { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialUnit")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsUnitRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_CORP_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_CORP_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -165,10 +162,27 @@ public class ZaxyyClient extends CommonHttpClient { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_PI_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PI_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + Map map = (Map) baseResponse.getData(); + List zzzyyProductsResponse = JSON.parseArray(map.get("list") + "", ZzzyyProductsResponse.class); + for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { + //判断要是规格和型号一致就是取规格 不一致就合并 + if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { + if (productsResponse.getModel_number().equals(productsResponse.getStandard())) { + productsResponse.setStandard(productsResponse.getStandard()); + } else { + productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number()); + } + } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { + productsResponse.setStandard(productsResponse.getModel_number()); + } + } + map.put("list", JSON.toJSON(zzzyyProductsResponse)); + baseResponse.setData(""); + baseResponse.setData(map); return baseResponse; } catch (Exception e) { log.error("解析诏安智业接口返回产品信息字典数据异常，返回结果：{}", response); @@ -199,7 +213,7 @@ public class ZaxyyClient extends CommonHttpClient { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialApply")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderQueryRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_BUS_TYPE_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -211,6 +225,9 @@ public class ZaxyyClient extends CommonHttpClient { } } + @Resource + private OrderUploadLogService orderUploadLogService; + @Override public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) { if (StrUtil.isBlank(udiwmsOrderRequest.getBillNo())) { @@ -227,15 +244,7 @@ public class ZaxyyClient extends CommonHttpClient { if (StrUtil.isBlank(thrSystemBusApiEntity.getUrl())) { return ResultVOUtils.error(500, "接口未配置，无法提交！"); } - - Integer userId; - if (orderEntity.getReviewUser() != null) { - userId = Integer.valueOf(orderEntity.getReviewUser()); - } else { - userId = Integer.valueOf(orderEntity.getCreateUser()); - } - AuthUserEntity authUser = authUserDao.selectById(userId); - zaxzyyOrderRequest.setThirdSys(authUser.getEmployeeName()); + zaxzyyOrderRequest.setThirdSys(getUserName(orderEntity)); zaxzyyOrderRequest.setBillType(thrSystemBusApiEntity.getThirdBuyCode()); zaxzyyOrderRequest.setBillFlag("1"); @@ -249,29 +258,43 @@ public class ZaxyyClient extends CommonHttpClient { zaxzyyOrderRequest.setCorpName(corpName); } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_INTTERNAL)) { //内部科室 - AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getCorpId())); - try { - //根据第三方系统标识，获取对应字段的值 - ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectOne(new LambdaQueryWrapper() - .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity)) - .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId())); - - zaxzyyOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); - zaxzyyOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); - } catch (Exception e) { - log.error("查询单据对应往来单位的第三方仓库信息异常", e); + BasicCorpEntity basicCorpEntity = null; + if (StrUtil.isNotEmpty(orderEntity.getFromCorp())) { + basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp()); + } + if (basicCorpEntity != null) { + zaxzyyOrderRequest.setCorpId(basicCorpEntity.getThirdId()); + zaxzyyOrderRequest.setCorpName(basicCorpEntity.getName()); + } else { + AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getCorpId())); + try { + //根据第三方系统标识，获取对应字段的值 + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectOne(new LambdaQueryWrapper() + .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity)) + .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId())); + + zaxzyyOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); + zaxzyyOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); + } catch (Exception e) { + log.error("查询单据对应往来单位的第三方仓库信息异常", e); + } } + } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_SP)) { //供应商 - ThrCorpEntity thrCorp = thrCorpService.getThrCorp(udiwmsOrderRequest.getCorpId()); - if (null != thrCorp) { - zaxzyyOrderRequest.setCorpId(thrCorp.getUnitId()); - zaxzyyOrderRequest.setCorpName(thrCorp.getName()); + BasicCorpEntity basicCorpEntity = null; + if (StrUtil.isNotEmpty(orderEntity.getFromCorp())) { + basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp()); + } + if (basicCorpEntity != null) { + zaxzyyOrderRequest.setCorpId(basicCorpEntity.getThirdId()); + zaxzyyOrderRequest.setCorpName(basicCorpEntity.getName()); } else { log.error("查询单据对应的第三方往来单位信息异常"); } } + //查询仓库信息 AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new QueryWrapper().eq("code", orderEntity.getInvCode())); try { @@ -279,13 +302,21 @@ public class ZaxyyClient extends CommonHttpClient { .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity)) .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId())); - zaxzyyOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode()); - zaxzyyOrderRequest.setLocInvName(thrInvWarehouseEntity.getName()); + if (thrInvWarehouseEntity != null) { + zaxzyyOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode()); + zaxzyyOrderRequest.setLocInvName(thrInvWarehouseEntity.getName()); + + zaxzyyOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); + zaxzyyOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); + } else { + orderUploadLogService.updateLocalErr(orderEntity, "查询第三方系统仓库信息异常"); + return ResultVOUtils.error(500, "查询第三方系统仓库信息异常"); + } - zaxzyyOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); - zaxzyyOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); } catch (Exception e) { - log.info("查询第三方系统仓库信息异常", e); + log.error("查询第三方系统仓库信息异常", ExceptionUtil.stacktraceToString(e)); + orderUploadLogService.updateLocalErr(orderEntity, "查询第三方系统仓库信息异常" + ExceptionUtil.stacktraceToString(e)); + return ResultVOUtils.error(500, "查询第三方系统仓库信息异常"); } //设置单据出入库类型 @@ -297,20 +328,38 @@ public class ZaxyyClient extends CommonHttpClient { //设置备注信息 zaxzyyOrderRequest.setRemark("udi管理系统提交单据"); - //组装单据明细数据 List ioCodeEntities = codeDao.selectList(new QueryWrapper() .eq("orderId", orderEntity.getBillNo()) .ne("action", "StockCheck") ); - List items = new ArrayList<>(); //查询业务单据详情 List detailBizEntities = orderDetailBizDao.selectList(new QueryWrapper().eq("orderIdFk", orderEntity.getBillNo())); setOrderDetailList(ioCodeEntities, items, detailBizEntities); - zaxzyyOrderRequest.setItem(items); + if (CollUtil.isEmpty(items)) { + log.error("\"产品信息对照异常，无法上传\""); + orderUploadLogService.updateLocalErr(orderEntity, "产品信息对照异常，无法上传"); + return ResultVOUtils.error(500, "产品信息对照异常，无法上传"); + } + for (UdiwmsOrderDetailRequest i : items) { + String fphm = ""; + String fprq = null; + List invoiceList = IoOrderInvoiceEntity.builder().build() + .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo()) + .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk()) + .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()). + groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); + if (CollectionUtil.isNotEmpty(invoiceList)) { + fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); + if (invoiceList.get(0).getInvoiceDate() != null) + fprq = DateUtil.formatDateTime(invoiceList.get(0).getInvoiceDate()); + } + i.setFirstSalesInvNo(fphm); + i.setInvoiceDate(fprq); + } //构造诏安接口参数 ZaZyRequest zaZyRequest = new ZaZyRequest(); @@ -335,6 +384,30 @@ public class ZaxyyClient extends CommonHttpClient { } + public String getUserName(IoOrderEntity orderEntity) { + + //创建人非供应商 + if (StrUtil.isNotEmpty(orderEntity.getCheckUser())) { + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser()); + return authUserEntity.getUserName(); + } else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) { + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser()); + return authUserEntity.getUserName(); + } else if (StrUtil.isNotEmpty(orderEntity.getCreateUser()) && orderEntity.getCreateUser().length() != 14) { + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCreateUser()); + return authUserEntity.getUserName(); + } else if (StrUtil.isNotEmpty(orderEntity.getUpdateUser()) && orderEntity.getUpdateUser().length() != 14) { + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getUpdateUser()); + return authUserEntity.getUserName(); + } else { + List authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper().eq("code", orderEntity.getInvCode())); + if (CollUtil.isNotEmpty(authWarehouseUsers)) { + return authWarehouseUsers.get(0).getUserName(); + } + } + return null; + } + /** * 处理提交单据，记录日志，解析结果逻辑 * @@ -350,7 +423,7 @@ public class ZaxyyClient extends CommonHttpClient { uploadLog.setSubmitTime(new Date()); uploadLog.setBillNo(orderEntity.getBillNo()); uploadLog.setFromType(Constants.THIRD_ORDER_UPLOAD); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest); response = parserResult(response); if (StrUtil.isNotBlank(response)) { try { @@ -392,6 +465,7 @@ public class ZaxyyClient extends CommonHttpClient { } } + /** * 封装单据详情参数 * @@ -401,64 +475,31 @@ public class ZaxyyClient extends CommonHttpClient { */ private void setOrderDetailList(List ioCodeEntities, List orderDetailRequests, List detailBizEntities) { for (IoOrderDetailBizEntity detailBizEntity : detailBizEntities) { - UdiwmsOrderDetailRequest item = buildProductInfo(detailBizEntity); - //封装条码信息 - submitOrderUtil.setCodeList(ioCodeEntities, detailBizEntity, item); - - orderDetailRequests.add(item); - } - } - - public UdiwmsOrderDetailRequest buildProductInfo(IoOrderDetailBizEntity detailBizEntity) { - //查询产品信息 - BasicUdirelEntity basicUdirel = basicUdirelDao.selectById(detailBizEntity.getBindRlFk()); - BasicProductsEntity basicProducts = basicProductsDao.selectOne(new LambdaQueryWrapper().eq(BasicProductsEntity::getUuid, basicUdirel.getUuid()).last("limit 1")); - - UdiwmsOrderDetailRequest item = new UdiwmsOrderDetailRequest(); - BeanUtil.copyProperties(detailBizEntity, item); - - item.setProductDate(DateUtil.formatExpireTime(StrUtil.isBlank(detailBizEntity.getProductDate()) ? null : "20" + detailBizEntity.getProductDate())); - item.setExpireDate(DateUtil.formatExpireTime(StrUtil.isBlank(detailBizEntity.getExpireDate()) ? null : "20" + detailBizEntity.getExpireDate())); - - String thirdProductId = (String) ReflectUtil.getFieldValue(basicUdirel, thirdSysConfig.getThirdId()); - item.setProductId(thirdProductId); //产品ID - //查询第三方产品名称 - ThrProductsEntity thrProductsEntity = thrProductsDao.selectOne(new LambdaQueryWrapper() - .eq(ThrProductsEntity::getCode, thirdProductId).last("limit 1")); - if (thrProductsEntity == null) { - log.error("第三方产品编码未关联"); - return null; + IoOrderDetailCodeEntity orderDetailCodeEntity = orderDetailCodeDao + .selectOne(new QueryWrapper() + .eq("orderIdFk", detailBizEntity.getOrderIdFk()) + .eq("bindRlFk", detailBizEntity.getBindRlFk()) + .eq(StrUtil.isNotEmpty(detailBizEntity.getBatchNo()), "batchNo", detailBizEntity.getBatchNo()) + .isNull(StrUtil.isEmpty(detailBizEntity.getBatchNo()), "batchNo").last("LIMIT 1")); + if (orderDetailCodeEntity != null && IntUtil.value(orderDetailCodeEntity.getReCount()) > 0) { + detailBizEntity.setCount(orderDetailCodeEntity.getReCount()); + UdiwmsOrderDetailRequest item = submitOrderUtil.buildProductInfo(detailBizEntity); + if (item != null) { + //封装条码信息 + submitOrderUtil.setCodeList(ioCodeEntities, detailBizEntity, item); + orderDetailRequests.add(item); + } + } } - item.setProductName(thrProductsEntity.getName()); //产品名称 - item.setBindRlFk(detailBizEntity.getBindRlFk()); - item.setStandard(detailBizEntity.getSpec()); //规格型号 - item.setBillNo(detailBizEntity.getOrderIdFk()); //单据号 - item.setRegisterNo(detailBizEntity.getCertCode()); //注册/备案证号 - item.setPrice(detailBizEntity.getPrice()); - item.setFirstSalesInvNo(detailBizEntity.getFirstSalesInvNo()); - item.setSecSalesInvNo(detailBizEntity.getSecSalesInvNo()); - item.setInvoiceDate(detailBizEntity.getInvoiceDate()); - item.setSecSalesListNo(detailBizEntity.getSecSalesListNo()); - item.setDiCode(detailBizEntity.getNameCode()); - item.setManufactory(basicProducts.getManufactory()); //生产厂家 - item.setMeasname(basicProducts.getMeasname()); //计量单位 - item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号 - item.setManufactoryCode(thrProductsEntity.getManufactoryCode()); - item.setSupCode(thrProductsEntity.getSupCode()); - item.setCplb(thrProductsEntity.getFlbm()); - item.setCount(detailBizEntity.getCount()); - - return item; } - @Override public BaseResponse getInvProducts(UdiwmsInvProductsRequest udiwmsInvProductsRequest) { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialStorage")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsInvProductsRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_INV_PI_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_INV_PI_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -475,7 +516,7 @@ public class ZaxyyClient extends CommonHttpClient { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("getMaterialDept")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsWarehouseRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_WAREHOUSE_QUERY_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_WAREHOUSE_QUERY_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); @@ -518,6 +559,13 @@ public class ZaxyyClient extends CommonHttpClient { return baseResponse; } + @Override + public BaseResponse postRelProduct(PostRelProductRequest postThrInvProductsRequest) { + + + return null; + } + @Override public BaseResponse testConnect() { UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); @@ -552,7 +600,7 @@ public class ZaxyyClient extends CommonHttpClient { ZaZyRequest zaZyRequest = new ZaZyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_PRE_IN_ORDER_SUBMIT_URL), zaZyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRE_IN_ORDER_SUBMIT_URL), zaZyRequest); response = parserResult(response); try { BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7a9395c..332dbbb 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_za?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: