交接单问题处理

hx-purchase/src/main/java/com/fjhx/purchase/controller/sales/SalesReturnController.java

@@ -1,16 +1,16 @@
 package com.fjhx.purchase.controller.sales;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.fjhx.purchase.entity.sales.po.SalesReturn;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.purchase.service.sales.SalesReturnService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@ public class SalesReturnController {
      * 根据供应商查询退货列表
      */
     @GetMapping("/getBySupplyId")
-    public List<SalesReturn> getBySupplyId(@RequestParam("supplyId") String supplyId) {
+    public List<SalesReturn> getBySupplyId(@RequestParam("supplyId") Long supplyId) {
         return salesReturnService.getListBySupplyId(supplyId);
     }
 

hx-purchase/src/main/java/com/fjhx/purchase/mapper/sales/SalesReturnMapper.java

@@ -1,19 +1,21 @@
 package com.fjhx.purchase.mapper.sales;
 
-import com.fjhx.purchase.entity.sales.po.SalesReturn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.purchase.entity.sales.po.SalesReturn;
 import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
  * 退货 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 public interface SalesReturnMapper extends BaseMapper<SalesReturn> {
@@ -23,4 +25,6 @@ public interface SalesReturnMapper extends BaseMapper<SalesReturn> {
      */
     Page<SalesReturnVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SalesReturn> wrapper);
 
+    List<SalesReturn> getListBySupplyId(@Param("supply_id") Long supply_id);
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/sales/SalesReturnService.java

@@ -1,11 +1,11 @@
 package com.fjhx.purchase.service.sales;
 
-import com.fjhx.purchase.entity.sales.po.SalesReturn;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
+import com.fjhx.purchase.entity.sales.po.SalesReturn;
+import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 
@@ -48,8 +48,9 @@ public interface SalesReturnService extends BaseService<SalesReturn> {
 
     /**
      * 根据供应商查询退货列表
+     *
      * @param supplyId
      * @return
      */
-    List<SalesReturn> getListBySupplyId(String supplyId);
+    List<SalesReturn> getListBySupplyId(Long supplyId);
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/sales/impl/SalesReturnServiceImpl.java

@@ -1,19 +1,18 @@
 package com.fjhx.purchase.service.sales.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
+import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.fjhx.purchase.entity.sales.po.SalesReturn;
+import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
 import com.fjhx.purchase.mapper.sales.SalesReturnMapper;
 import com.fjhx.purchase.service.sales.SalesReturnService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.sales.vo.SalesReturnVo;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.purchase.entity.sales.dto.SalesReturnDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -62,12 +61,14 @@ public class SalesReturnServiceImpl extends ServiceImpl<SalesReturnMapper, Sales
 
     /**
      * 根据供应商查询退货列表
+     *
      * @param supplyId
      * @return
      */
     @Override
-    public List<SalesReturn> getListBySupplyId(String supplyId) {
-        return this.list(Wrappers.<SalesReturn>query().lambda().eq(SalesReturn::getSupplyId,supplyId));
+    public List<SalesReturn> getListBySupplyId(Long supplyId) {
+//        return this.list(Wrappers.<SalesReturn>query().lambda().eq(SalesReturn::getSupplyId,supplyId));
+        return baseMapper.getListBySupplyId(supplyId);
     }
 
 }

hx-purchase/src/main/resources/mapper/sales/SalesReturnMapper.xml

@@ -14,5 +14,18 @@
         from sales_return sr
             ${ew.customSqlSegment}
     </select>
+    <select id="getListBySupplyId" resultType="com.fjhx.purchase.entity.sales.po.SalesReturn">
+        SELECT sr.id,
+               sr.CODE,
+               sr.supply_id,
+               srd.STATUS,
+               sr.create_user,
+               sr.create_time,
+               sr.update_user,
+               sr.update_time
+        FROM sales_return sr
+                 JOIN sales_return_detail srd ON srd.sales_return_id = sr.id
+        where sr.supply_id = #{supply_id}
+    </select>
 
 </mapper>

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -79,7 +79,6 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         IWrapper<ContractProduct> wrapper = getWrapper();
         wrapper.orderByDesc("t1", ContractProduct::getCreateTime);
         wrapper.between("t2", Contract::getStatus, FlowStatusEnum.PASS.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
-        wrapper.gt("t1", ContractProduct::getExpendQuantity, BigDecimal.ZERO);
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t2.`code`"), new SqlField("t2.`user_name`"));
         }

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -139,17 +139,16 @@
     </select>
 
     <select id="getListByIds" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
-        SELECT
-            t1.id,
-            t1.contract_id,
-            t1.product_id,
-            t2.`code` AS contractCode,
-            t2.user_name AS userName,
-            t2.version AS contractVersion,
-            t1.expend_quantity expendQuantity
-        FROM
-            contract_product t1
-        LEFT JOIN contract t2 ON t1.contract_id = t2.id
+        SELECT t1.id,
+               t1.contract_id,
+               t1.product_id,
+               t2.`code`    AS    contractCode,
+               t2.user_name AS    userName,
+               t2.version   AS    contractVersion,
+               t1.expend_quantity expendQuantity,
+               t1.quantity
+        FROM contract_product t1
+                 LEFT JOIN contract t2 ON t1.contract_id = t2.id
             ${ew.customSqlSegment}
     </select>