Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -378,10 +378,10 @@
                t.sku_id,
                tmgs.sku_images,
                tmgs.flg_sub_unit AS "flgSubUnit",
-               t.outing_box AS "outingBox",
-               t.outing_piece AS "outingPiece",
+               t.outing_box ,
+               t.outing_piece ,
                tmgs.price_standard AS "priceStandard",
-                tmgs.pack_box AS "packBox",
+               t.pack_box  ,
                 tmgus.unit_name         as "subUnitName",
                 tmgu.unit_name         as "unitName",
                tmgs.sku_code                                                             as "skuCode",

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

@@ -362,8 +362,8 @@
                sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) AS  "outTypeName",
                t.outing_qty,
                t.outing_amt,
-               (t.outing_amt + t.out_amt) AS "sumOutAmt",
-               (t.outing_qty + t.out_qty) AS "sumOutQty",
+               CAST(t.outing_amt AS DECIMAL(10,2)) + CAST(t.out_amt AS DECIMAL(10,2))  AS "sumOutAmt",
+               CAST(t.outing_qty AS DECIMAL(10,2)) + CAST(t.out_qty AS DECIMAL(10,2))  AS "sumOutQty",
                t.out_qty,
                t.out_amt,
                t.return_qty,