1.添加删除寄售库存接口

src/main/java/com/glxp/api/controller/inv/InvPreProductController.java

@@ -4,11 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
+import com.glxp.api.entity.inv.InvPreProductEntity;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
 import com.glxp.api.req.inv.FilterInvPreProductRequest;
+import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inv.InvPreProductDetailResponse;
 import com.glxp.api.res.inv.InvPreProductPageResponse;
@@ -19,7 +23,10 @@ import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.service.inv.InvPreProductService;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -103,4 +110,37 @@ public class InvPreProductController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    /**
+     * 删除寄售库存
+     *
+     * @param deleteRequest
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/spms/inv/pre/product/delete")
+    public BaseResponse deleteInvPreProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        String id = deleteRequest.getId();
+        InvPreProductEntity invPreProductEntity = invPreProductService.findById(id);
+        if (null != invPreProductEntity) {
+            FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
+            detailRequest.setSupId(invPreProductEntity.getSupId());
+            detailRequest.setRelId(String.valueOf(invPreProductEntity.getRelIdFk()));
+            detailRequest.setInvCode(invPreProductEntity.getInvCode());
+            if (StrUtil.isBlank(invPreProductEntity.getBatchNo())) {
+                detailRequest.setBatchNo("empty");
+            } else {
+                detailRequest.setBatchNo(invPreProductEntity.getBatchNo());
+            }
+            invPreProductService.deleteById(id);
+            invPreProductDetailService.deleteInvPreProductDetail(detailRequest);
+            return ResultVOUtils.success("删除成功");
+        } else {
+            return ResultVOUtils.error(500, "删除失败");
+        }
+    }
+
 }

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -123,7 +123,7 @@ public class InvProductController {
         }
 
         String id = deleteRequest.getId();
-        InvProductEntity invProductEntity = invProductService.findById(deleteRequest.getId());
+        InvProductEntity invProductEntity = invProductService.findById(id);
         if (null != invProductEntity) {
             FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
             detailRequest.setSupId(invProductEntity.getSupId());

src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java

@@ -3,6 +3,7 @@ package com.glxp.api.dao.inv;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
+import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 
 import java.util.List;
 
@@ -18,4 +19,12 @@ public interface InvPreProductDetailDao extends BaseMapperPlus<InvPreProductDeta
      * @return
      */
     List<InvPreProductDetailEntity> filterPreProductDetailList(FilterInvPreProductDetailRequest invPreProductDetailRequest);
+
+    /**
+     * 删除寄售库存详情
+     *
+     * @param detailRequest
+     * @return
+     */
+    boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
 }

src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.inv;
 
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
+import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.res.inv.InvPreProductDetailResponse;
 
 import java.util.List;
@@ -31,4 +32,11 @@ public interface InvPreProductDetailService {
      * @param response
      */
     void setOrderInfo(InvPreProductDetailResponse response);
+
+    /**
+     * 删除寄售库存详情
+     *
+     * @param detailRequest
+     */
+    boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
 }

src/main/java/com/glxp/api/service/inv/InvPreProductService.java

@@ -33,4 +33,11 @@ public interface InvPreProductService {
      */
     List<InvPreProductEntity> filterPreProductList(FilterInvPreProductRequest invPreProductRequest);
 
+    /**
+     * 根据ID查询寄售库存信息
+     *
+     * @param id
+     * @return
+     */
+    InvPreProductEntity findById(String id);
 }

src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java

@@ -10,6 +10,8 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
+import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.inv.InvPreProductDetailResponse;
 import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.util.DateUtil;
@@ -76,4 +78,9 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
         response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
     }
+
+    @Override
+    public boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest) {
+        return invPreProductDetailDao.deleteInvPreProductDetail(detailRequest);
+    }
 }

src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java

@@ -58,4 +58,10 @@ public class InvPreProductServiceImpl implements InvPreProductService {
         }
         return invPreProductDao.filterPreProductList(invPreProductRequest);
     }
+
+    @Override
+    public InvPreProductEntity findById(String id) {
+        return invPreProductDao.selectById(id);
+    }
+
 }

src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml

@@ -53,4 +53,26 @@
             </if>
         </where>
     </select>
+
+    <delete id="deleteInvPreProductDetail">
+        delete
+        from inv_pre_product_detail
+        <where>
+            <if test="relId != null and relId != ''">
+                AND relId = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != '' and batchNo != 'empty'">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="batchNo == 'empty'">
+                AND batchNo is null
+            </if>
+            <if test="supId != null and supId != ''">
+                AND supId = #{supId}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND invCode = #{invCode}
+            </if>
+        </where>
+    </delete>
 </mapper>