第三方仓库，第三方业务单据类型修改

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java

@@ -157,7 +157,8 @@ public class BussinessOriginTypeController {
                     }
                     if (basicThirdSysBusApiEntities.size() >= 100) {
                         page++;
-                    }
+                    } else
+                        break;
                 } else {
                     break;
                 }

api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java

@@ -80,6 +80,8 @@ public class ErpBasicClient {
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getOrderType";
         UdiwmsBusTypeRequest udiwmsBusTypeRequest = new UdiwmsBusTypeRequest();
         udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk());
+        udiwmsBusTypeRequest.setPage(filterBasicThirdSysDetailRequest.getPage());
+        udiwmsBusTypeRequest.setLimit(filterBasicThirdSysDetailRequest.getLimit());
         String response = HttpClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity);
         log.info(response);
         try {

api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java

@@ -15,4 +15,5 @@ public class BussinessOriginTypeFilterRequest extends ListPageRequest {
     private String localAction;
     private String lastUpdateTime;
     private Integer corpType;
+    private String key;
 }

api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -127,6 +128,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
                     thrInvWarehouseEntity.setThirdSysFk(thirdSysFk);
                     thrInvWarehouseEntity.setAdvanceType(false); //默认是仓库
                     thrInvWarehouseEntity.setStatus(1);//默认启用
+                    thrInvWarehouseEntity.setUpdateTime(new Date());
                     list.add(thrInvWarehouseEntity);
                 }
                 //插入数据

api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml

@@ -59,11 +59,16 @@
         <where>
             basic_third_sys_detail.key = 'busTypeQueryUrl' and basic_third_sys_detail.enabled=1
             <if test="name != ''and name != null">
-                AND name LIKE concat(#{name},'%')
+                AND basic_bustype_origin.name LIKE concat(#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND action LIKE concat(#{action},'%')
+                AND basic_bustype_origin.action LIKE concat(#{action},'%')
             </if>
+            <if test="key != ''and key != null">
+                AND( (basic_bustype_origin.name LIKE concat(#{key},'%') )or( basic_bustype_origin.action LIKE
+                concat(#{key},'%')) )
+            </if>
+
 
         </where>
     </select>
@@ -79,7 +84,8 @@
         #{enable},
         #{remark},
         #{thirdSys},
-        #{thirdSysName},#{inoutType}
+        #{thirdSysName},
+        #{inoutType}
         )
     </insert>
 

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml

@@ -26,8 +26,8 @@
                 AND isDefault = #{isDefault}
             </if>
             <if test="key != null">
-                and code like concat('%', #{key}, '%')
+                and (code like concat('%', #{key}, '%')
-                        or `name` like concat('%', #{key}, '%')
+                or `name` like concat('%', #{key}, '%'))
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
@@ -77,13 +77,21 @@
     </select>
     <insert id="insertThrInvWarehouse" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity">
-        replace INTO thr_inv_warehouse
+        replace
+        INTO thr_inv_warehouse
         (pid, code, name, advanceType, isDefault,
          status, updateTime, remark, thirdSysFk)
-        values (#{pid}, #{code},
+        values (
-                #{name}, #{advanceType}, #{isDefault},
+        #{pid},
-                #{status}, #{updateTime},
+        #{code},
-                #{remark}, #{thirdSysFk})
+        #{name},
+        #{advanceType},
+        #{isDefault},
+        #{status},
+        #{updateTime},
+        #{remark},
+        #{thirdSysFk}
+        )
     </insert>
 
     <insert id="insertThrInvWarehouses" parameterType="java.util.List">