于继渤 2 лет назад
Родитель
Сommit
d0701b8c4e

+ 2 - 0
src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -185,6 +185,7 @@
         <result column="inv_qty" property="invQty"/>
         <result column="outing_qty" property="outingQty"/>
         <result column="price_std" property="priceStd"/>
+        <result column="into_item_id" property="intoItemId"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -463,6 +464,7 @@
         .
         item_id
         AS list_item_id,
+        tpii.item_id  AS list_into_item_Id,
         tpii.into_id AS list_into_id,
         tpii.into_type AS list_into_type,
         tpii.from_id AS list_from_id,

+ 2 - 0
src/main/java/com/dk/mdm/model/vo/ivt/IntoReturnItemVO.java

@@ -258,6 +258,8 @@ public class IntoReturnItemVO  {
     private String invId;
 
 
+
+
     private static final long serialVersionUID = 1L;
 
 }

+ 2 - 2
src/main/java/com/dk/mdm/service/ivt/IntoReturnService.java

@@ -262,8 +262,8 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             //采购订单id
             intoReturnItemVO.setPurId(purchaseItemResponse.getPurId());
             intoReturnItemVO.setPurItemId(purchaseItemResponse.getItemId());
-            intoReturnItemVO.setIntoItemId(intoReturnItemVO.getItemId());
-            intoReturnItemVO.setItemId(null);
+            intoReturnItemVO.setIntoItemId(intoReturnItemVO.getIntoItemId());
+           intoReturnItemVO.setItemId(null);
             //标价
             intoReturnItemVO.setPriceStd(purchaseItemResponse.getPriceStd());
             //标价金额 (商品数量*标价)