diff --git a/pom.xml b/pom.xml index 0cbc256..8684cfc 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,7 @@ + UDIC_UCLOUD_SERVER org.springframework.boot 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 646b549..c95f306 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -3,6 +3,7 @@ package com.glxp.mipsdl.client.ptxhyy; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; 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.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; @@ -19,6 +20,7 @@ import com.glxp.mipsdl.dao.thrsys.ThrProductsDao; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; 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; @@ -88,7 +90,7 @@ public class PtxhyyClient extends CommonHttpClient { } udiwmsOrderRequest.setBillType(thrSystemBusApiEntity.getThirdBuyCode()); //查询单据类型,设置往来单位信息 - BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeDao.selectByAction(udiwmsOrderRequest.getBillType()); + BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeDao.selectByAction(orderEntity.getAction()); if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_HOSPTIAL)) { //医院客户 udiwmsOrderRequest.setCorpId(orderEntity.getFromCorp()); @@ -112,10 +114,11 @@ public class PtxhyyClient extends CommonHttpClient { } } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_SP)) { //供应商 - ThrCorpEntity thrCorp = thrCorpService.getThrCorp(udiwmsOrderRequest.getCorpId()); - if (null != thrCorp) { - udiwmsOrderRequest.setCorpId(thrCorp.getUnitId()); - udiwmsOrderRequest.setCorpName(thrCorp.getName()); + + BasicCorpEntity basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp()); + if (null != basicCorpEntity) { + udiwmsOrderRequest.setCorpId(basicCorpEntity.getThirdId()); + udiwmsOrderRequest.setCorpName(basicCorpEntity.getName()); } else { String msg = "查询单据对应的第三方往来单位信息异常"; log.error(msg); @@ -157,7 +160,7 @@ public class PtxhyyClient extends CommonHttpClient { udiwmsOrderRequest.setInoutType(2); //出库 } - udiwmsOrderRequest.setRemark("udi管理系统提交单据"); + udiwmsOrderRequest.setRemark("udi管理系统提交单据:" + orderEntity.getBillNo()); //组装单据明细数据 List ioCodeEntities = codeDao.selectList(new LambdaQueryWrapper() @@ -187,7 +190,7 @@ public class PtxhyyClient extends CommonHttpClient { .fpzs(CollectionUtil.isNotEmpty(ioOrderInvoiceEntities) ? ioOrderInvoiceEntities.size() : 0) .udixh(udiwmsOrderRequest.getBillNo()) .build(); - + ptxhyyOrderRequest.setDetailList(new ArrayList<>()); setOrderDetailList(ioCodeEntities, items, detailBizEntities); Collections.reverse(items); diff --git a/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java index 00fde7d..2cad5d6 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java @@ -20,6 +20,7 @@ import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; 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; diff --git a/src/main/java/com/glxp/mipsdl/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/mipsdl/dao/basic/BasicCorpDao.java index 081083f..9106c54 100644 --- a/src/main/java/com/glxp/mipsdl/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/basic/BasicCorpDao.java @@ -13,4 +13,8 @@ public interface BasicCorpDao extends BaseMapper { * @return */ String selectNameByErpId(@Param("erpId") String erpId); -} \ No newline at end of file + + BasicCorpEntity selectByErpId(@Param("erpId") String erpId); + + +} diff --git a/src/main/java/com/glxp/mipsdl/http/HttpClient.java b/src/main/java/com/glxp/mipsdl/http/HttpClient.java index 7556e93..4fb44d6 100644 --- a/src/main/java/com/glxp/mipsdl/http/HttpClient.java +++ b/src/main/java/com/glxp/mipsdl/http/HttpClient.java @@ -66,7 +66,6 @@ public class HttpClient { //转json字符串时,将空属性转换为空字符串 String json = JSONObject.toJSONString(object, JSONWriter.Feature.WriteNullStringAsEmpty); log.info(url + "\n" + json); - String response = ""; Integer status; try { diff --git a/src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderRequest.java b/src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderRequest.java index 61f4e6b..10a3314 100644 --- a/src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderRequest.java @@ -85,5 +85,5 @@ public class PtxhyyOrderRequest { */ private String udixh; - private List detailList = new ArrayList<>(100); + private List detailList; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 57abc32..6aa5d3e 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -1,72 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - erpId, - `name`, - spell, - addr, - `status`, - `type`, - contact, - mobile, - creditNo, - thirdId, - thirdId1, - thirdId2, - thirdId3, - thirdId4, - thirdName, - thirdName1, - thirdName2, - thirdName3, - thirdName4, - corpType, - outType, - `createUser`, - createTime, - updateUser, - updateTime, - remark - - - \ No newline at end of file + + +