From a7ec23daf75dd16954c67ece16a7e1a64cf69490 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Jul 2023 14:11:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=BD=AD=E4=B8=AD=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/ptxhyy/PtxhyyClient.java | 5 +- .../glxp/mipsdl/client/zzzyy/ZzzyyClient.java | 83 +++++++++++++------ src/main/resources/application-dev.yml | 2 +- 3 files changed, 61 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 42c1414..366cbbe 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -104,8 +104,9 @@ public class PtxhyyClient extends CommonHttpClient { String corpName = basicCorpDao.selectNameByErpId(orderEntity.getFromCorp()); udiwmsOrderRequest.setCorpName(corpName); } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_INTTERNAL)) { + BasicCorpEntity basicCorpEntity = null; if (StrUtil.isNotEmpty(orderEntity.getFromCorp())) { - BasicCorpEntity basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp()); + basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp()); if (null != basicCorpEntity) { udiwmsOrderRequest.setCorpId(basicCorpEntity.getThirdId()); udiwmsOrderRequest.setCorpName(basicCorpEntity.getName()); @@ -295,7 +296,7 @@ public class PtxhyyClient extends CommonHttpClient { public String getUserName(IoOrderEntity orderEntity) { //创建人非供应商 - if (StrUtil.isNotEmpty(orderEntity.getCheckUser())) { + if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) { AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser()); return authUserEntity.getUserName(); } else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) { diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index cb07142..e15798f 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -14,6 +14,7 @@ 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.inout.IoCodeDao; @@ -24,7 +25,9 @@ import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; 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.BasicCorpEntity; import com.glxp.mipsdl.entity.inout.IoCodeEntity; import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity; import com.glxp.mipsdl.entity.inout.IoOrderEntity; @@ -101,6 +104,8 @@ public class ZzzyyClient implements BaseHttpClient { private IoOrderUploadLogDao orderUploadLogDao; @Resource private SubmitOrderUtil submitOrderUtil; + @Resource + AuthWarehouseUserMapper authWarehouseUserMapper; /** * 拼接xml请求头 @@ -157,8 +162,8 @@ public class ZzzyyClient implements BaseHttpClient { 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); + 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())) { @@ -171,7 +176,7 @@ public class ZzzyyClient implements BaseHttpClient { productsResponse.setStandard(productsResponse.getModel_number()); } } - map.put("list",JSON.toJSON(zzzyyProductsResponse)); + map.put("list", JSON.toJSON(zzzyyProductsResponse)); baseResponse.setData(""); baseResponse.setData(map); return baseResponse; @@ -231,17 +236,9 @@ public class ZzzyyClient implements BaseHttpClient { //查询对应的第三方单据类型 ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getBillType())); if (StrUtil.isBlank(thrSystemBusApiEntity.getUrl())) { - return ResultVOUtils.error(500, "接口未配置，无法提交！"); +// 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"); @@ -255,18 +252,28 @@ public class ZzzyyClient implements BaseHttpClient { 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()); @@ -324,8 +331,8 @@ public class ZzzyyClient implements BaseHttpClient { String key = "orderSubmitUrl"; zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest)); } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) { - zaxzyyOrderRequest.setLocStorageCode("1001304"); - zaxzyyOrderRequest.setLocStorageName("骨科耗材及试剂仓库"); +// zaxzyyOrderRequest.setLocStorageCode("1001304"); +// zaxzyyOrderRequest.setLocStorageName("骨科耗材及试剂仓库"); //临床出库 zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); String key = "preInOrderSubmit"; @@ -338,6 +345,30 @@ public class ZzzyyClient implements BaseHttpClient { } + 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; + } + /** * 处理提交单据，记录日志，解析结果逻辑 * diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a1f86b4..5e6d970 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?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_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: