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

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

@@ -557,7 +557,7 @@
         tpii.non_std_code,
         tpii.into_status,
       --   sys.f_remove_zero(tpii.into_qty - tpii.return_qty)  AS can_return_qty,
-        sys.f_remove_zero(COALESCE(tpsii.into_qty, 0) - COALESCE(tpsii.return_qty, 0) + tpii.intoing_qty + tpii.into_qty) as can_return_qty,
+        -sys.f_remove_zero(COALESCE(tpsii.into_qty, 0) + tpii.intoing_qty + tpii.into_qty) as can_return_qty,
         sys.f_remove_zero(tpii.intoing_qty + tpii.into_qty)               as intoing_qty,
         sys.f_remove_zero(tpii.intoing_amt + tpii.into_amt)   as intoing_amt,
         sys.f_remove_zero ( tpii.into_qty ) AS into_qty,

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

@@ -208,6 +208,7 @@
         <result column="pack_box_text" property="packBoxText"/>
         <result column="can_return_qty" property="canReturnQty"/>
         <result column="price_into" property="priceInto"/>
+        <result column="sku_spec" property="skuSpec"/>
 
     </resultMap>
 
@@ -681,7 +682,7 @@
         tmgb.short_name AS  list_short_name,
         tmgs.sku_images AS  list_sku_images,
         tmgs.price_standard AS list_price_std,
-
+        tmgs.sku_spec          as "list_sku_spec",
         i.inv_id  as list_inv_id,
         i.wh_id as list_wh_id,
         i.inv_qty    as list_inv_qty,

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -145,10 +145,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             //入库中
             inboundVO.setIntoStatus(Constant.IntoStatus.RUKUZHONG.getName());
         }
-        //退货数量
-        inboundVO.setReturnQty(inboundVO.getIntoingQty());
-        //退货金额
-        inboundVO.setReturnAmt(inboundVO.getIntoingAmt());
+
         //入库状态等于已入库 更新合计入库数量/金额 = 入库中数量/入库中金额
         if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
             inboundVO