Merge remote-tracking branch 'origin/newFrame' into newFrame

src/main/java/com/glxp/api/controller/inventory/InvSubWarehouseController.java

@@ -64,7 +64,12 @@ public class InvSubWarehouseController {
     @GetMapping("spms/sub/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
         List<InvSubWarehouseResponse> responses = invSubWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
-        return ResultVOUtils.success(responses);
+        PageInfo<InvSubWarehouseResponse> pageInfo = new PageInfo<>(responses);
+        PageSimpleResponse<InvSubWarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(responses);
+        return ResultVOUtils.success(pageSimpleResponse);
+
     }
 
 

src/main/java/com/glxp/api/entity/inventory/InvSubWarehouseEntity.java

@@ -23,4 +23,5 @@ public class InvSubWarehouseEntity {
     public String thirdId4;
     public String thirdName4;
     private String warehouseName;//仓库名字
+    private String parentCode;
 }

src/main/java/com/glxp/api/res/inventory/InvSubWarehouseResponse.java

@@ -19,5 +19,7 @@ public class InvSubWarehouseResponse {
     private String parentName;
     private String remark;
     private boolean defaultInv;
+    private String parentCode;
+    private String parentInvName;
 
 }

src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -121,14 +121,15 @@
             parameterType="com.glxp.api.entity.inventory.InvSubWarehouseEntity">
         replace
         INTO inv_warehouse_sub
-        (id, code, `name`, parentId, remark,defaultInv)
+        (id, code, `name`, parentId, remark,defaultInv,parentCode)
         values (
         #{id},
         #{code},
         #{name},
         #{parentId},
         #{remark},
-        #{defaultInv}
+        #{defaultInv},
+        #{parentCode}
         )
     </insert>
 
@@ -154,13 +155,14 @@
             <if test="parentId != null">parentId=#{parentId},</if>
             <if test="remark != null">remark=#{remark},</if>
             <if test="defaultInv != null">defaultInv=#{defaultInv},</if>
+            <if test="parentCode != null">parentCode=#{parentCode},</if>
         </trim>
         WHERE id = #{id}
     </update>
 
     <insert id="importInvSubWarehouse" parameterType="java.util.List">
         replace into inv_warehouse_sub
-        (id, code, `name`, parentId, remark,defaultInv)
+        (id, code, `name`, parentId, remark,defaultInv,parentCode)
         values
         <foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
             (
@@ -168,7 +170,7 @@
             #{item.code},
             #{item.name},
             #{item.parentId},
-            #{item.remark},#{item.defaultInv})
+            #{item.remark},#{item.defaultInv},#{item.parentCode})
         </foreach>
     </insert>
 
@@ -194,9 +196,10 @@
     <select id="filterInvSubWarehouseResponse"
             resultType="com.glxp.api.res.inventory.InvSubWarehouseResponse">
         select a.id, a.code, a.name, a.parentId, a.remark, a.defaultInv, a.thirdId, a.thirdId1, a.thirdId2,
-        a.thirdId3, a.thirdId4, b.name as parentName
+        a.thirdId3, a.thirdId4, b.name as parentName,a.parentCode,c.name parentInvName
         FROM inv_warehouse_sub a
         left join inv_warehouse b on a.parentId = b.code
+        left join inv_warehouse_sub c on a.parentCode = c.code
         <where>
             <if test="id != '' and id != null">
                 AND a.id = #{id}
@@ -233,20 +236,20 @@
 
     <select id="filterSubInvList" resultType="com.glxp.api.res.inventory.InvSubWarehouseResponse">
         select a.id,
-               a.code,
-               a.name,
-               a.parentId,
-               a.remark,
-               a.defaultInv,
-               a.thirdId,
-               a.thirdId1,
-               a.thirdId2,
-               a.thirdId3,
-               a.thirdId4,
-               b.name parentName
+        a.code,
+        a.name,
+        a.parentId,
+        a.remark,
+        a.defaultInv,
+        a.thirdId,
+        a.thirdId1,
+        a.thirdId2,
+        a.thirdId3,
+        a.thirdId4,
+        b.name parentName,a.parentCode
         from inv_warehouse_sub a
-                 left join inv_warehouse b on a.parentId = b.code
-                 left join inv_warehouse_user c on a.code = c.code
+        left join inv_warehouse b on a.parentId = b.code
+        left join inv_warehouse_user c on a.code = c.code
         <where>
             <if test="userId != null">
                 AND c.userId = #{userId}

src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml

@@ -224,6 +224,8 @@
             <if test="thirdId3 != null">remark=#{thirdId3},</if>
             <if test="thirdId4 != null">remark=#{thirdId4},</if>
             <if test="spUse != null">spUse=#{spUse},</if>
+
+
         </trim>
         WHERE id = #{id}
     </update>

src/main/resources/schemas/schema_v2.1.sql

@@ -5,7 +5,7 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint ', 1);
 
 CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2);
-
+CALL Pro_Temp_ColumnWork ('inv_warehouse_sub','parentCode','varchar(255)', 1);