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

+ 7 - 2
src/main/java/com/dk/mdm/controller/ivt/IntoReturnController.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Api(tags = "入库退货API接口")
 @RestController
 @RequestMapping("/ivt/intoReturn")
-public class IntoReturnController{
+public class IntoReturnController {
 
     public BaseService<IntoReturn> getService() {
         return intoReturnService;
@@ -44,6 +44,7 @@ public class IntoReturnController{
     public ResponseResultVO<PageList<IntoReturnResponse>> selectByCond(@RequestBody IntoReturnQuery intoReturnQuery) {
         return intoReturnService.selectByCond(intoReturnQuery);
     }
+
     /**
      * @desc : 新建采购退货
      * @author : 于继渤
@@ -82,7 +83,11 @@ public class IntoReturnController{
         return intoReturnService.selectByUpdate(id);
     }
 
-
+    /**
+     * @desc : 采购退货编辑
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
     @ApiOperation(value = "编辑", notes = "编辑")
     @PostMapping({"update"})
     public ResponseResultVO<?> update(@RequestBody IntoReturnVO intoReturnVO) {

+ 3 - 1
src/main/java/com/dk/mdm/mapper/ivt/IntoReturnItemMapper.xml

@@ -84,6 +84,7 @@
         <result column="sku_name" property="skuName"/>
         <result column="sku_model" property="skuModel"/>
         <result column="sku_images" property="skuImages"/>
+        <result column="reject_qty" property="rejectQty"/>
         <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
@@ -220,7 +221,8 @@
         tpii.into_qty as "intoQty",
         tpii.into_amt as "intoAmt",
         tpii.return_qty as "returnQty",
-        tpii.return_amt as "returnAmt"
+        tpii.return_amt as "returnAmt",
+        (tpii.into_qty - tpii.return_qty) AS reject_qty
         FROM dkic_b.t_psi_into_return_item  tpiri
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpiri.sku_id
         left join dkic_b.t_psi_inbound_item tpii on tpiri.into_item_id = tpii.item_id

+ 3 - 0
src/main/java/com/dk/mdm/model/response/ivt/IntoReturnItemResponse.java

@@ -278,6 +278,9 @@ public class IntoReturnItemResponse  {
     @ApiModelProperty(value = "已入库退货金额")
     private BigDecimal returnAmt;
 
+    @ApiModelProperty(value = "可退数量")
+    private BigDecimal rejectQty;
+
 
     private static final long serialVersionUID = 1L;