Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/controller/ivt/inboundReturnController.java

@@ -8,7 +8,6 @@ import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.response.ivt.InboundResponse;
 import com.dk.mdm.model.vo.ivt.InboundVO;
-import com.dk.mdm.model.vo.ivt.IntoReturnVO;
 import com.dk.mdm.service.ivt.InboundReturnService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,9 +26,7 @@ public class inboundReturnController {
 
     @Autowired
     private InboundReturnService inboundReturnService;
-
-
-
+    
     /**
      * @desc   : 条件查询
      * @author : 于继渤

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

@@ -5,7 +5,13 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, into_id, into_type, from_id, from_item_id, item_index, sku_id, price_into, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, into_id, into_type, from_id, from_item_id, item_index, sku_id, price_into, non_std_code, into_status,
+               intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, remarks, inv_id
+               , cost_price, cost_amt, out_qty, inv_qty, flg_valid, cp_id, op_create_time, op_create_user_id,
+               op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,s_into_id,
+                s_into_item_id,
+                s_pur_id,
+                s_pur_item_id
     </sql>
 
     <!-- response通用查询列 -->
@@ -13,7 +19,10 @@
         tpii.item_id, tpii.into_id, tpii.into_type, tpii.from_id, tpii.from_item_id, tpii.item_index, tpii.sku_id, tpii.price_into,
         tpii.non_std_code, tpii.into_status, tpii.intoing_qty, tpii.intoing_amt, tpii.into_qty, tpii.into_amt, tpii.return_qty,
         tpii.return_amt, tpii.remarks, tpii.inv_id, tpii.cost_price, tpii.cost_amt, tpii.out_qty, tpii.inv_qty, tpii.flg_valid,
-        tpii.cp_id
+        tpii.cp_id ,tpii.s_into_id,
+                tpii.s_into_item_id,
+                tpii.s_pur_id,
+                tpii.s_pur_item_id
     </sql>
 
 
@@ -50,6 +59,14 @@
                 <result column="op_app_code" property="opAppCode"/>
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
+
+
+        <result column="s_into_id" property="sIntoId" typeHandler="UuidTypeHandler"/>
+        <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
+        <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
+        <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
+
+
     </resultMap>
 
 
@@ -79,6 +96,10 @@
         <result column="inv_qty" property="invQty"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
+        <result column="s_into_id" property="sIntoId" typeHandler="UuidTypeHandler"/>
+        <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
+        <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
+        <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -218,6 +239,10 @@
             inv_qty,
             cp_id,
             op_app_code,
+            s_into_id,
+            s_into_item_id,
+            s_pur_id,
+            s_pur_item_id,
         </trim>
         )
         values
@@ -247,6 +272,10 @@
                 #{item.invQty},
                 #{item.cpId},
                 #{item.opAppCode},
+                #{item.sIntoId}::uuid,
+                #{item.sIntoItemId}::uuid,
+                #{item.sPurId}::uuid,
+                #{item.sPurItemId}::uuid,
             </trim>
             )
         </foreach>

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -306,15 +306,21 @@ public class InboundItem  extends PageInfo<InboundItem> implements Serializable
     private String whId;
 
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
+    @ApiModelProperty(value = "源入库单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoId;
 
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
+    @ApiModelProperty(value = "源入库单明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoItemId;
+
+    @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurId;
+
+    @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurItemId;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/query/ivt/InboundItemQuery.java

@@ -254,15 +254,21 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery>  {
     private String opDbUser;
 
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
+    @ApiModelProperty(value = "源入库单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoId;
 
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
+    @ApiModelProperty(value = "源入库单明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoItemId;
+
+    @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurId;
+
+    @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurItemId;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -298,6 +298,22 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "库存业务类型（入库4种，出库4中）")
     private String inventoryDocCode;
 
+    @ApiModelProperty(value = "源入库单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoId;
+
+    @ApiModelProperty(value = "源入库单明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoItemId;
+
+    @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurId;
+
+    @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurItemId;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -197,16 +197,22 @@ public class InboundItemVO  {
     @ApiModelProperty(value = "入库仓库")
     private String whId;
 
+    @ApiModelProperty(value = "源入库单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoId;
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
+    @ApiModelProperty(value = "源入库单明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sIntoItemId;
+
+    @ApiModelProperty(value = "源采购订单ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurId;
+
+    @ApiModelProperty(value = "源采购明细ID（采购退货时记录）")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sPurItemId;
 
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
 
     @ApiModelProperty(value = "库存类型（入库，出库）")
     private String inventoryType;

src/main/java/com/dk/mdm/service/ivt/InboundReturnService.java

@@ -12,6 +12,7 @@ import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.infrastructure.convert.ivt.InboundConvert;
 import com.dk.mdm.infrastructure.convert.ivt.InboundItemConvert;
+import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.ivt.InboundItemMapper;
 import com.dk.mdm.mapper.ivt.InboundMapper;
 import com.dk.mdm.mapper.pur.PurchaseItemMapper;
@@ -78,6 +79,8 @@ public class InboundReturnService extends BaseService<Inbound> {
 
 
     @Autowired
+    private AuthUtils authUtils;
+    @Autowired
     private InboundPurchaseReturnService inboundPurchaseReturnService;
 
     @Pagination
@@ -121,7 +124,7 @@ public class InboundReturnService extends BaseService<Inbound> {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.PURCHASE_RETURN_DETAIL_NOT_EXIST.getMessage());
         }
         //查询采购订单
-        PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId());
+        PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId()); //采购订单id
 
         inboundVO.setReturnQty(inboundVO.getReturnQty().abs());
         inboundVO.setReturnAmt(inboundVO.getReturnAmt().abs());
@@ -135,13 +138,13 @@ public class InboundReturnService extends BaseService<Inbound> {
         //反写入库订单明细、反写订单明细
         for (InboundItemVO inboundItemVO : itemList) {
             //根据退货明细中入库明细id查询入库明细数据
-            InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getItemId());
+            InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getItemId()); //原入库单明细id
             BigDecimal returnQty = inboundItemResponse.getReturnQty().add(inboundItemVO.getReturnQty().setScale(6, BigDecimal.ROUND_HALF_UP));
             BigDecimal returnAmt = inboundItemResponse.getReturnAmt().add(inboundItemVO.getReturnAmt().setScale(6, BigDecimal.ROUND_HALF_UP));
             sumReturnQty = sumReturnQty.add(returnQty);
             sumReturnAmt = sumReturnAmt.add(returnAmt);
             //反写入库单退货数量金额 todo
-            InboundResponse inboundResponse = inboundMapper.selectById(inboundItemVO.getIntoId());
+            InboundResponse inboundResponse = inboundMapper.selectById(inboundItemVO.getIntoId()); //原入库单id
             inboundMapper.updateAmount(new Inbound().setIntoId(inboundItemVO.getIntoId())
                     .setReturnQty(inboundResponse.getReturnQty().add(sumReturnQty))
                     .setReturnAmt(inboundResponse.getReturnAmt().add(sumReturnAmt)));
@@ -163,6 +166,36 @@ public class InboundReturnService extends BaseService<Inbound> {
 
             );
         }
+        inboundVO.setFromId(inboundVO.getIntoId());
+        inboundVO.setFromNo(inboundVO.getIntoNo());
+        inboundVO.setIntoingQty(inboundVO.getReturnQty().multiply(new BigDecimal(-1)));
+        inboundVO.setIntoingAmt(inboundVO.getReturnAmt().multiply(new BigDecimal(-1)));
+        List<InboundItemVO> list = new ArrayList<>();
+        for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
+
+            inboundItemVO.setIntoingQty(inboundItemVO.getReturnQty().multiply(new BigDecimal(-1)));
+            inboundItemVO.setIntoingAmt(inboundItemVO.getReturnAmt().multiply(new BigDecimal(-1)));
+            inboundItemVO.setPriceInto(inboundItemVO.getPriceInto());
+            inboundItemVO.setFromItemId(inboundItemVO.getItemId());
+            inboundItemVO.setSkuId(inboundItemVO.getSkuId());
+            inboundItemVO.setItemIndex(inboundItemVO.getItemIndex());
+            inboundItemVO.setNonStdCode(inboundItemVO.getNonStdCode());
+            inboundItemVO.setReturnQty(inboundItemVO.getReturnQty());
+            inboundItemVO.setReturnAmt(inboundItemVO.getReturnAmt());
+
+            //源入库单ID（采购退货时记录）
+            inboundItemVO.setSIntoId(inboundItemVO.getIntoId());
+            //源入库单明细ID（采购退货时记录）
+            inboundItemVO.setSIntoItemId(inboundItemVO.getItemId());
+            //源采购订单ID（采购退货时记录）
+            inboundItemVO.setSPurId(inboundItemVO.getFromId());
+            //源采购明细ID（采购退货时记录）
+            inboundItemVO.setSPurItemId(inboundItemVO.getFromItemId());
+            inboundItemVO.setItemId(null);
+            list.add(inboundItemVO);
+        }
+
+        inboundVO.setItemList(list);
         //获取 id/单号
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.SALERETURN.getName(), false);
         inboundVO.setIntoId(codeMap.get("outId").toString()).
@@ -234,33 +267,6 @@ public class InboundReturnService extends BaseService<Inbound> {
             inboundItemMapper.insert(inboundItem);
 
         }
-
-
-
-        inboundVO.setFromId(inboundVO.getIntoId());
-        inboundVO.setFromNo(inboundVO.getIntoNo());
-
-        inboundVO.setIntoingQty(inboundVO.getReturnQty().multiply(new BigDecimal(-1)));
-        inboundVO.setIntoingAmt(inboundVO.getReturnAmt().multiply(new BigDecimal(-1)));
-        List<InboundItemVO> list = new ArrayList<>();
-        for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
-
-            inboundItemVO.setIntoingQty(inboundItemVO.getReturnQty().multiply(new BigDecimal(-1)));
-            inboundItemVO.setIntoingAmt(inboundItemVO.getReturnAmt().multiply(new BigDecimal(-1)));
-            inboundItemVO.setPriceInto(inboundItemVO.getPriceInto());
-            inboundItemVO.setFromItemId(inboundItemVO.getItemId());
-            inboundItemVO.setSkuId(inboundItemVO.getSkuId());
-            inboundItemVO.setItemIndex(inboundItemVO.getItemIndex());
-            inboundItemVO.setNonStdCode(inboundItemVO.getNonStdCode());
-            inboundItemVO.setReturnQty(inboundItemVO.getReturnQty());
-            inboundItemVO.setReturnAmt(inboundItemVO.getReturnAmt());
-            list.add(inboundItemVO);
-        }
-
-        inboundVO.setItemList(list);
-
-        inboundPurchaseReturnService.purchaseReturnInboundInsert(inboundVO);
-
         return ResponseResultUtil.success();
     }
 }