退货编辑

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

@@ -958,6 +958,6 @@
         Left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
         left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tpi.into_reason
         left join t_mac_account_item tmai on tmai.item_id = tpi.receivable_id
-        WHERE tpi.into_id = #{intoId}::uuid
+        WHERE tpi.into_id = #{intoId}::uuid AND tpi.flg_valid = true
     </select>
 </mapper>

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

@@ -98,7 +98,7 @@ public class InboundReturnService extends BaseService<Inbound> {
                     ErrorCodeEnum.INBOUND_CANNOT_BE_EMPTY.getMessage());
         }
         //查询明细
-        List<InboundItemResponse> inboundItemResponselist = inboundItemMapper.selectByInboundReturnCond(new InboundItemQuery().setIntoId(intoId));
+        List<InboundItemResponse> inboundItemResponselist = inboundItemMapper.selectByInboundReturnCond(new InboundItemQuery().setIntoId(intoId).setFlgValid(true));
         inboundResponse.setGoodsList(inboundItemResponselist);
         return ResponseResultUtil.success(inboundResponse);
     }
@@ -217,9 +217,6 @@ public class InboundReturnService extends BaseService<Inbound> {
                 .setReturnQty(purchaseReturnQty.add(inboundVO.getReturnAmt()))
                 .setReturnAmt(purchaseReturnAmt.add(inboundVO.getReturnQty()))
         );
-
-
-
         //校验明细
         if(inboundVO.getItemList() != null &&  inboundVO.getItemList().size() > 0){
             for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
@@ -275,6 +272,22 @@ public class InboundReturnService extends BaseService<Inbound> {
             }
         }
 
+        //删除 采退入库明细
+        if(inboundVO.getDeleteItemList() != null  && inboundVO.getDeleteItemList().size() > 0){
+            for (InboundItemVO inboundItemVO : inboundVO.getDeleteItemList()) {
+                if (inboundItemVO.getItemId() != null) {
+                    //修改 采退明细 状态
+                    InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
+                    inboundItem.setFlgValid(false);
+                    //修改
+                    inboundItemMapper.update(inboundItem,
+                            new UpdateWrapper<InboundItem>().lambda()
+                                    .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+                    );
+                }
+            }
+        }
+
         //修改采退总单
         Inbound inbound = new Inbound();
         inbound.setIntoId(inboundVO.getIntoId());