1、修改上传附件

2、修改退货编辑语句

src/main/java/com/dk/mdm/controller/FileController.java

@@ -76,26 +76,27 @@ public class FileController {
             if ("mp4".equals(fileType) || "avi".equals(fileType) || "mov".equals(fileType)) {
                 return "video";
             }
-            // 小程序
-            if (Constant.AppCode.WEIXIN.getCode().equals(appCode)) {
+            // 网页端
+            if (Constant.AppCode.WEB.getCode().equals(appCode)) {
+
                 if ("xls".equals(fileType) || "xlsx".equals(fileType)) {
-                    return "file";
+                    return "excel";
                 }
                 if ("pdf".equals(fileType)) {
-                    return "file";
+                    return "pdf";
                 }
                 if ("jpg".equals(fileType) || "jepg".equals(fileType) || "png".equals(fileType)) {
-                    return "image";
+                    return "img";
                 }
             } else {
                 if ("xls".equals(fileType) || "xlsx".equals(fileType)) {
-                    return "excel";
+                    return "file";
                 }
                 if ("pdf".equals(fileType)) {
-                    return "pdf";
+                    return "file";
                 }
                 if ("jpg".equals(fileType) || "jepg".equals(fileType) || "png".equals(fileType)) {
-                    return "img";
+                    return "image";
                 }
             }
         }

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -596,7 +596,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(t.outing_qty + t.out_qty)                                                              as outing_qty,
                t.outing_amt + t.out_amt                                                              as outing_amt,
                t.non_std_code,
-               t.remarks
+               t.remarks,
                tmgu.decimal_places    as "decimalPlaces",
                tmgus.unit_name         as "subUnitName",
                tmgu.unit_name         as "unitName" ,
@@ -654,17 +654,17 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
             t.non_std_code,
-               t.remarks
-                ,tmgu.decimal_places    as "decimalPlaces"
-                ,tmgus.unit_name         as "subUnitName"
-                ,tmgu.unit_name         as "unitName"
-                ,t.pack_box
-                ,tmgs.flg_sub_unit       as "flgSubUnit"
-                ,t.outing_box
-                ,t.outing_piece
-                ,t.out_box
-                ,t.out_piece
-        ,t.out_status
+               t.remarks,
+               tmgu.decimal_places    as "decimalPlaces",
+                tmgus.unit_name         as "subUnitName",
+                tmgu.unit_name         as "unitName",
+                t.pack_box,
+                tmgs.flg_sub_unit       as "flgSubUnit",
+                t.outing_box,
+                t.outing_piece,
+                t.out_box,
+                t.out_piece,
+                t.out_status
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id