诊断单据产品下载问题

src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java

@@ -99,7 +99,7 @@ public class ThrOrdersDlService {
                 ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
                 if (originEntity != null) {
                     thrOrderService.deleteById(originEntity.getId() + "");
-                    thrOrderDetailService.deleteByOrderIdFk(originEntity.getId() + "");
+                    thrOrderDetailService.deleteByOrderIdFk(originEntity.getBillNo() + "");
                 }
                 thrOrderService.insertThrOrder(thrOrderEntity);
                 List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -224,6 +224,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         filterThrProductsRequest.setThirdSysFk(filterThrProductsRequest.getThirdSys());
         filterThrProductsRequest.setLimit(limit);
         log.error("开始下载-------");
+        int count = 0;
         while (true) {
             log.error("下载分页-------" + page);
             filterThrProductsRequest.setPage(page);
@@ -258,10 +259,18 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                 if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) {
                     page++;
                 } else {
-                    break;
+                    if (count == 0) {
+                        page++;
+                        count++;
+                    } else
+                        break;
                 }
             } else {
-                return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
+                if (count == 0) {
+                    page++;
+                    count++;
+                } else
+                    return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
             }
         }
         log.error("下载结束-------");

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-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
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.glxp.api.dao.thrsys.ThrProductsDao">
     <select id="filterThrProducts" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
-        SELECT *,cb.userName as createByName
+        SELECT *, cb.userName as createByName
         FROM thr_products
-        LEFT JOIN auth_user cb ON thr_products.createUser = cb.id
+                     LEFT JOIN auth_user cb ON thr_products.createUser = cb.id
         <where>
             <if test="name != '' and name != null">
                 AND name LIKE concat('%', #{name}, '%')
@@ -203,7 +203,7 @@
                 #{price},
                 #{createUser},
                 #{createTime},
-                #{updateUser}, #{manufactoryCode}, #{supCode},#{type})
+                #{updateUser}, #{manufactoryCode}, #{supCode}, #{type})
     </insert>
 
     <select id="selectByLastTime" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
@@ -219,7 +219,7 @@
                  cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
                  thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,
                  price,
-                 createUser, createTime, updateUser, manufactoryCode, supCode,type)
+                 createUser, createTime, updateUser, manufactoryCode, supCode, type)
                 values
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item.code},
@@ -252,7 +252,7 @@
             #{item.price},
             #{item.createUser},
             #{item.createTime},
-            #{item.updateUser}, #{manufactoryCode}, #{supCode} , #{type}
+            #{item.updateUser}, #{manufactoryCode}, #{supCode}, #{type}
         </foreach>
     </insert>
 
@@ -330,7 +330,7 @@
             price           = #{price,jdbcType=VARCHAR},
             manufactoryCode = #{manufactoryCode,jdbcType=VARCHAR},
             supCode         = #{supCode,jdbcType=VARCHAR},
-            type         = #{type,jdbcType=VARCHAR}
+            type            = #{type,jdbcType=VARCHAR}
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -338,14 +338,11 @@
     <select id="filterThrProductsByMainId" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
         SELECT *
         FROM thr_products
-        LEFT JOIN basic_udirel  ON thr_products.code = basic_udirel.mainId
+                     LEFT JOIN basic_udirel ON thr_products.code = basic_udirel.mainId
         <where>
             <if test="relId != '' and relId != null">
-                AND basic_udirel.id  = #{relId}
+                AND basic_udirel.id = #{relId}
             </if>
         </where>
     </select>
-
-
-
 </mapper>