单据接口上传修改

pom.xml

@@ -133,6 +133,7 @@
     </dependencies>
 
     <build>
+        <finalName>UDIC_UCLOUD_SERVER</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

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) {
+            BasicCorpEntity basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp());
-                udiwmsOrderRequest.setCorpId(thrCorp.getUnitId());
+            if (null != basicCorpEntity) {
-                udiwmsOrderRequest.setCorpName(thrCorp.getName());
+                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<IoCodeEntity> ioCodeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>()
@@ -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);

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;

src/main/java/com/glxp/mipsdl/dao/basic/BasicCorpDao.java

@@ -13,4 +13,8 @@ public interface BasicCorpDao extends BaseMapper<BasicCorpEntity> {
      * @return
      */
     String selectNameByErpId(@Param("erpId") String erpId);
+
+    BasicCorpEntity selectByErpId(@Param("erpId") String erpId);
+
+
 }

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 {

src/main/java/com/glxp/mipsdl/req/ptxhyy/PtxhyyOrderRequest.java

@@ -85,5 +85,5 @@ public class PtxhyyOrderRequest {
      */
     private String udixh;
 
-    private List<PtxhyyOrderDetailRequest> detailList = new ArrayList<>(100);
+    private List<PtxhyyOrderDetailRequest> detailList;
 }

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -1,72 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.mipsdl.dao.basic.BasicCorpDao">
-    <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.basic.BasicCorpEntity">
-        <!--@mbg.generated-->
-        <!--@Table basic_corp-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="erpId" jdbcType="VARCHAR" property="erpId"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="spell" jdbcType="VARCHAR" property="spell"/>
-        <result column="addr" jdbcType="VARCHAR" property="addr"/>
-        <result column="status" jdbcType="TINYINT" property="status"/>
-        <result column="type" jdbcType="VARCHAR" property="type"/>
-        <result column="contact" jdbcType="VARCHAR" property="contact"/>
-        <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
-        <result column="creditNo" jdbcType="VARCHAR" property="creditNo"/>
-        <result column="thirdId" jdbcType="VARCHAR" property="thirdId"/>
-        <result column="thirdId1" jdbcType="VARCHAR" property="thirdId1"/>
-        <result column="thirdId2" jdbcType="VARCHAR" property="thirdId2"/>
-        <result column="thirdId3" jdbcType="VARCHAR" property="thirdId3"/>
-        <result column="thirdId4" jdbcType="VARCHAR" property="thirdId4"/>
-        <result column="thirdName" jdbcType="VARCHAR" property="thirdName"/>
-        <result column="thirdName1" jdbcType="VARCHAR" property="thirdName1"/>
-        <result column="thirdName2" jdbcType="VARCHAR" property="thirdName2"/>
-        <result column="thirdName3" jdbcType="VARCHAR" property="thirdName3"/>
-        <result column="thirdName4" jdbcType="VARCHAR" property="thirdName4"/>
-        <result column="corpType" jdbcType="TINYINT" property="corpType"/>
-        <result column="outType" jdbcType="TINYINT" property="outType"/>
-        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
-        <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
-        <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="remark" jdbcType="VARCHAR" property="remark"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <!--@mbg.generated-->
-        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
-    </sql>
-
     <select id="selectNameByErpId" resultType="java.lang.String">
         select `name`
         from basic_corp
         where erpId = #{erpId}
+        limit 1
     </select>
 
+
+    <select id="selectByErpId" resultType="com.glxp.mipsdl.entity.basic.BasicCorpEntity">
+        select *
+        from basic_corp
+        where erpId = #{erpId}
+        limit 1
+    </select>
 </mapper>