新增供应商库存相关。新增资质证书兼容pdf,word文档

src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java

@@ -85,6 +85,9 @@ public class InvWarehouseEntity {
      */
     @TableField(value = "advanceType")
     private Boolean advanceType;
+    @TableField(value = "spUse")
+    private Boolean spUse;
+
 
     @TableField(exist = false)
     public String thirdName;

src/main/java/com/glxp/api/upload/DownloadController.java

@@ -19,25 +19,49 @@ public class DownloadController {
     public void getImage(HttpServletResponse response
             , @RequestParam String type
             , @RequestParam String name) throws IOException {
-        OutputStream os = null;
-        try {
-            // 读取图片
-            BufferedImage image = ImageIO.read(
-                    new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name)));
-            response.setContentType("image/png");
-            os = response.getOutputStream();
 
-            if (image != null) {
+        if (name.endsWith("pdf")) {
-                ImageIO.write(image, "png", os);
+            OutputStream os = null;
+            try {
+                FileInputStream input = new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name));
+                OutputStream out = response.getOutputStream();
+                byte[] b = new byte[2048];
+                int len;
+                while ((len = input.read(b)) != -1) {
+                    out.write(b, 0, len);
+                }
+                input.close();
+            } catch (IOException e) {
+
+            } finally {
+                if (os != null) {
+                    os.flush();
+                    os.close();
+                }
             }
-        } catch (IOException e) {
+        } else {
-            e.printStackTrace();
+            OutputStream os = null;
-        } finally {
+            try {
-            if (os != null) {
+                // 读取图片
-                os.flush();
+                BufferedImage image = ImageIO.read(
-                os.close();
+                        new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name)));
+                response.setContentType("image/png");
+                os = response.getOutputStream();
+
+                if (image != null) {
+                    ImageIO.write(image, "png", os);
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                if (os != null) {
+                    os.flush();
+                    os.close();
+                }
             }
         }
+
+
     }
 
     @GetMapping(value = "/udiwms/donwload/file")
@@ -63,4 +87,4 @@ public class DownloadController {
         }
     }
 
-}
+}

src/main/java/com/glxp/api/upload/uploadController.java

@@ -112,8 +112,8 @@ public class uploadController {
         String fileName = file.getOriginalFilename();
         String fileType = fileName.substring(fileName.lastIndexOf("."));
         // 文件类型判断
-        if (StringUtils.isBlank(fileType) || !fileType.equals(".jpg") && !fileType.equals(".png")) {
+        if (StringUtils.isBlank(fileType) || (!fileType.equals(".jpg") && !fileType.equals(".png") && !fileType.equals(".doc") &&!fileType.equals(".pdf"))) {
-            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 .jpg,.png 格式");
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式");
         }
         String newName = UUID.randomUUID() + fileType;//生成新文件名
         String savePath = "d:/1s/udiwms/register/file/" + type;
@@ -135,4 +135,4 @@ public class uploadController {
         }
         return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
     }
-}
+}

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

@@ -38,11 +38,11 @@
                a4.name
                        thirdName4
         from auth_warehouse
-                 LEFT JOIN thr_inv_warehouse a on a.code = auth_warehouse.thirdId
+                     LEFT JOIN thr_inv_warehouse a on a.code = auth_warehouse.thirdId
-                 LEFT JOIN thr_inv_warehouse a1 on a1.code = auth_warehouse.thirdId1
+                     LEFT JOIN thr_inv_warehouse a1 on a1.code = auth_warehouse.thirdId1
-                 LEFT JOIN thr_inv_warehouse a2 on a2.code = auth_warehouse.thirdId2
+                     LEFT JOIN thr_inv_warehouse a2 on a2.code = auth_warehouse.thirdId2
-                 LEFT JOIN thr_inv_warehouse a3 on a3.code = auth_warehouse.thirdId3
+                     LEFT JOIN thr_inv_warehouse a3 on a3.code = auth_warehouse.thirdId3
-                 LEFT JOIN thr_inv_warehouse a4 on a4.code = auth_warehouse.thirdId4
+                     LEFT JOIN thr_inv_warehouse a4 on a4.code = auth_warehouse.thirdId4
         <where>
             <if test="code != '' and code != null">
                 AND auth_warehouse.code = #{code}
@@ -61,9 +61,9 @@
     <select id="filterGroupInvSub" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
             resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse
-            INNER JOIN
+                INNER JOIN
-        auth_dept
+                auth_dept
-        on auth_warehouse.parentId = auth_dept.code
+                        on auth_warehouse.parentId = auth_dept.code
         <if test="userId != '' and userId != null">
             INNER JOIN auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         </if>
@@ -88,7 +88,7 @@
             </if>
             <if test="superiorCode != '' and superiorCode != null">
                 AND (auth_dept.code = #{superiorPcode}
-                    OR auth_dept.pcode = #{superiorCode})
+                        OR auth_dept.pcode = #{superiorCode})
             </if>
             <if test="subordinateCode != '' and subordinateCode != null">
                 AND auth_dept.pcode = #{subordinateCode}
@@ -133,9 +133,9 @@
     <insert id="insertInvSubWarehouse" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
         replace
-            INTO auth_warehouse
+                INTO auth_warehouse
-        ( id, code, `name`, parentId, remark, defaultInv, advanceType, parentCode
+                ( id, code, `name`, parentId, remark, defaultInv, advanceType, parentCode
-        , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
+                , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
         values (#{id},
                 #{code},
                 #{name},
@@ -210,10 +210,11 @@
 
     <insert id="importInvSubWarehouse" parameterType="java.util.List">
         replace
-            into auth_warehouse
+                into auth_warehouse
-        (id, code, `name`, parentId, remark, defaultInv, parentCode, advanceType, thirdId, thirdId1, thirdId2, thirdId3,
+                (id, code, `name`, parentId, remark, defaultInv, parentCode, advanceType, spUse, thirdId, thirdId1,
-         thirdId4)
+                 thirdId2, thirdId3,
-        values
+                 thirdId4)
+                values
 
 
         <foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
@@ -225,6 +226,7 @@
              #{item.defaultInv},
              #{item.parentCode},
              #{item.advanceType},
+             #{item.spUse},
              #{item.thirdId},
              #{item.thirdId1},
              #{item.thirdId2},
@@ -270,8 +272,8 @@
                a.parentCode,
                c.name    parentInvName
         FROM auth_warehouse a
-                 left join auth_dept b on a.parentId = b.code
+                     left join auth_dept b on a.parentId = b.code
-                 left join auth_warehouse c on a.parentCode = c.code
+                     left join auth_warehouse c on a.parentCode = c.code
         <where>
             <if test="id != '' and id != null">
                 AND a.id = #{id}
@@ -301,9 +303,9 @@
             resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select auth_warehouse.*, auth_dept.`name` AS warehouseName
         from auth_warehouse
-                 INNER JOIN
+                     INNER JOIN
-             auth_dept
+                     auth_dept
-             on auth_warehouse.parentId = auth_dept.code
+                             on auth_warehouse.parentId = auth_dept.code
         <where>
             <if test="subordinateCode != '' and subordinateCode != null">
                 AND auth_dept.pcode = #{subordinateCode}
@@ -327,8 +329,8 @@
                b.name parentName,
                a.parentCode
         from auth_warehouse a
-                 left join auth_dept b on a.parentId = b.code
+                     left join auth_dept b on a.parentId = b.code
-                 left join auth_warehouse_user c on a.code = c.code
+                     left join auth_warehouse_user c on a.code = c.code
         <where>
             <if test="userId != null">
                 AND c.userId = #{userId}
@@ -350,8 +352,8 @@
                auth_warehouse.parentCode,
                auth_dept.name warehouseName
         from auth_warehouse
-                 inner join auth_dept on auth_warehouse.parentId = auth_dept.code
+                     inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                 inner join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+                     inner join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         <where>
             <if test="userId != null">
                 AND auth_warehouse_user.userId = #{userId}
@@ -362,6 +364,9 @@
             <if test="advanceType != null">
                 AND auth_warehouse.advanceType = #{advanceType}
             </if>
+            <if test="spUse != null">
+                AND auth_warehouse.spUse = #{spUse}
+            </if>
         </where>
     </select>
 

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

@@ -9,6 +9,8 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ',
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
 
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1);
+
 
 CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1);