Merge branch 'test' into dev

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

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

@@ -40,6 +40,7 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
 
     @Autowired
     private PackDetailProductService packDetailProductService;
+
     @Autowired
     private DocumentsService documentsService;
 
@@ -81,11 +82,11 @@ 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<Long> packShipmentIds = documentsService.listObject(Documents::getPackShipmentId, q -> q.orderByAsc(Documents::getContractId));
         //查询出货绑定主合同列表详情
         List<PackShipmentVo> packShipments = baseMapper.getList(Wrappers.query()
-                .like(ObjectUtil.isNotEmpty(dto.getKeyword()), " c.code", dto.getKeyword())
-                .notIn(ObjectUtil.isNotEmpty(documentsIds), "ps.contract_id", documentsIds)
+                .like(ObjectUtil.isNotEmpty(dto.getKeyword()), "c.code", dto.getKeyword())
+                .notIn(ObjectUtil.isNotEmpty(packShipmentIds), "ps.id", packShipmentIds)
         );
         return packShipments;
     }