新增供应商库存相关。新增资质证书兼容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,6 +19,27 @@ public class DownloadController {
     public void getImage(HttpServletResponse response
             , @RequestParam String type
             , @RequestParam String name) throws IOException {
+
+        if (name.endsWith("pdf")) {
+            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();
+                }
+            }
+        } else {
             OutputStream os = null;
             try {
                 // 读取图片
@@ -40,6 +61,9 @@ public class DownloadController {
             }
         }
 
+
+    }
+
     @GetMapping(value = "/udiwms/donwload/file")
     public void download(HttpServletResponse response,
                          @RequestParam String fileName) throws IOException {

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;

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

@@ -211,7 +211,8 @@
     <insert id="importInvSubWarehouse" parameterType="java.util.List">
         replace
                 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,
+                 thirdId2, thirdId3,
                  thirdId4)
                 values
 
@@ -225,6 +226,7 @@
              #{item.defaultInv},
              #{item.parentCode},
              #{item.advanceType},
+             #{item.spUse},
              #{item.thirdId},
              #{item.thirdId1},
              #{item.thirdId2},
@@ -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);