Merge remote-tracking branch 'origin/dev' into dev

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/dto/PaySelectDto.java

@@ -34,7 +34,7 @@ public class PaySelectDto extends BaseSelectDto {
     /**
      * 付款方式 funds_payment_method
      */
-    private Integer payType;
+    private String payType;
 
     /**
      * 申请开始金额

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

@@ -19,6 +19,7 @@
                sr.CODE,
                sr.supply_id,
                srd.STATUS,
+               sr.approved_date,
                sr.create_user,
                sr.create_time,
                sr.update_user,

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackShipmentServiceImpl.java

@@ -5,11 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
 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.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
 import com.fjhx.sale.mapper.pack.PackShipmentMapper;
+import com.fjhx.sale.service.documents.DocumentsService;
 import com.fjhx.sale.service.pack.PackDetailGoodsService;
 import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackShipmentService;
@@ -38,6 +40,8 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
 
     @Autowired
     private PackDetailProductService packDetailProductService;
+    @Autowired
+    private DocumentsService documentsService;
 
     @Override
     public Page<PackShipmentVo> getPage(PackShipmentSelectDto dto) {
@@ -77,9 +81,12 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
      */
     @Override
     public List<PackShipmentVo> getList(PackShipmentSelectDto dto) {
+        List<Long> documentsIds = documentsService.listObject(Documents::getContractId, q -> q.orderByAsc(Documents::getContractId));
         //查询出货绑定主合同列表详情
         List<PackShipmentVo> packShipments = baseMapper.getList(Wrappers.query()
-                .like(ObjectUtil.isNotEmpty(dto.getKeyword())," c.code",dto.getKeyword()));
+                .like(ObjectUtil.isNotEmpty(dto.getKeyword()), " c.code", dto.getKeyword())
+                .notIn("ps.contract_id", documentsIds)
+        );
         return packShipments;
     }